1 files changed, 63 insertions, 39 deletions

diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
index 83ca0d49830..82bfce7a62f 100644
--- a/pkgs/development/mobile/androidenv/sysimages.nix
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -18,7 +18,7 @@ in
   sysimg_armeabi-v7a_14 = buildSystemImage {
     name = "sysimg-armeabi-v7a-14";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip;
       sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
     };
   };
@@ -26,103 +26,111 @@ in
   sysimg_armeabi-v7a_15 = buildSystemImage {
     name = "sysimg-armeabi-v7a-15";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r02.zip;
-      sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-15_r03.zip;
+      sha1 = "0a47f586e172b1cf3db2ada857a70c2bdec24ef8";
     };
   };
 
   sysimg_armeabi-v7a_16 = buildSystemImage {
     name = "sysimg-armeabi-v7a-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r03.zip;
-      sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip;
+      sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f";
     };
   };
 
   sysimg_armeabi-v7a_17 = buildSystemImage {
     name = "sysimg-armeabi-v7a-17";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r02.zip;
-      sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-17_r03.zip;
+      sha1 = "97cfad22b51c8475e228b207dd36dbef1c18fa38";
     };
   };
 
   sysimg_armeabi-v7a_18 = buildSystemImage {
     name = "sysimg-armeabi-v7a-18";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r02.zip;
-      sha1 = "4a1a93200210d8c42793324362868846f67401ab";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-18_r03.zip;
+      sha1 = "2d7d51f4d2742744766511e5d6b491bd49161c51";
     };
   };
 
   sysimg_armeabi-v7a_19 = buildSystemImage {
     name = "sysimg-armeabi-v7a-19";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r02.zip;
-      sha1 = "e0d375397e28e3d5d9577a00132463a4696248e5";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-19_r03.zip;
+      sha1 = "5daf7718e3ab03d9bd8792b492dd305f386ef12f";
     };
   };
 
   sysimg_armeabi-v7a_21 = buildSystemImage {
     name = "sysimg-armeabi-v7a-21";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-21_r03.zip;
       sha1 = "0b2e21421d29f48211b5289ca4addfa7f4c7ae5a";
     };
   };
 
+  sysimg_armeabi-v7a_22 = buildSystemImage {
+    name = "sysimg-armeabi-v7a-22";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip;
+      sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8";
+    };
+  };
+
   sysimg_x86_10 = buildSystemImage {
     name = "sysimg-x86-10";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-10_r02.zip;
-      sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-10_r03.zip;
+      sha1 = "6b8539eaca9685d2d3289bf8e6d21d366d791326";
     };
   };
 
   sysimg_x86_15 = buildSystemImage {
     name = "sysimg-x86-15";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-15_r01.zip;
-      sha1 = "d540325952e0f097509622b9e685737584b83e40";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-15_r02.zip;
+      sha1 = "56b8d4b3d0f6a8876bc78d654da186f3b7b7c44f";
     };
   };
 
   sysimg_x86_16 = buildSystemImage {
     name = "sysimg-x86-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-16_r01.zip;
-      sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-16_r02.zip;
+      sha1 = "36c2a2e394bcb3290583ce09815eae7711d0b2c2";
     };
   };
 
   sysimg_x86_17 = buildSystemImage {
     name = "sysimg-x86-17";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-17_r01.zip;
-      sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-17_r02.zip;
+      sha1 = "bd8c7c5411431af7e051cbe961be430fc31e773d";
     };
   };
 
   sysimg_x86_18 = buildSystemImage {
     name = "sysimg-x86-18";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-18_r01.zip;
-      sha1 = "f11bc9fccd3e7e46c07d8b26e112a8d0b45966c1";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-18_r02.zip;
+      sha1 = "ab3de121a44fca43ac3aa83f7d68cc47fc643ee8";
     };
   };
 
   sysimg_x86_19 = buildSystemImage {
     name = "sysimg-x86-19";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-19_r02.zip;
-      sha1 = "8889cb418984a2a7916a359da7c429d2431ed060";
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-19_r03.zip;
+      sha1 = "3782f3ebac5e54b3de454570add401989515ffca";
     };
   };
 
   sysimg_x86_21 = buildSystemImage {
     name = "sysimg-x86-21";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-21_r03.zip;
       sha1 = "a0b510c66769e84fa5e40515531be2d266a4247f";
     };
   };
@@ -130,7 +138,7 @@ in
   sysimg_x86_64_21 = buildSystemImage {
     name = "sysimg-x86_64-21";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r03.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-21_r03.zip;
       sha1 = "2f205b728695d84488156f4846beb83a353ea64b";
     };
   };
@@ -138,7 +146,7 @@ in
   sysimg_x86_22 = buildSystemImage {
     name = "sysimg-x86-22";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86-22_r01.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-22_r01.zip;
       sha1 = "6c7bb51e41a16099bb1f2a3cc81fdb5aa053fc15";
     };
   };
@@ -146,23 +154,15 @@ in
   sysimg_x86_64_22 = buildSystemImage {
     name = "sysimg-x86_64-22";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r01.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-22_r01.zip;
       sha1 = "05752813603f9fa03a58dcf7f8f5e779be722aae";
     };
   };
 
-  sysimg_armeabi-v7a_22 = buildSystemImage {
-    name = "sysimg-armeabi-v7a-22";
-    src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_arm-22_r01.zip;
-      sha1 = "2aa6a887ee75dcf3ac34627853d561997792fcb8";
-    };
-  };
-
   sysimg_mips_15 = buildSystemImage {
     name = "sysimg-mips-15";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip;
       sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9";
     };
   };
@@ -170,7 +170,7 @@ in
   sysimg_mips_16 = buildSystemImage {
     name = "sysimg-mips-16";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip;
       sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e";
     };
   };
@@ -178,8 +178,32 @@ in
   sysimg_mips_17 = buildSystemImage {
     name = "sysimg-mips-17";
     src = fetchurl {
-      url = https://dl-ssl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip;
       sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d";
     };
   };
+
+  sysimg_x86_23 = buildSystemImage {
+    name = "sysimg-x86-23";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-23_r03.zip;
+      sha1 = "3cb2e8efb575c35a558b091eac7e1bc5843f5f12";
+    };
+  };
+
+  sysimg_x86_64_23 = buildSystemImage {
+    name = "sysimg-x86_64-23";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-23_r03.zip;
+      sha1 = "226510856431bc4a73690540a8d7cbad974bedd3";
+    };
+  };
+
+  sysimg_armeabi-v7a_23 = buildSystemImage {
+    name = "sysimg-armeabi-v7a-23";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sys-img/android/sysimg_arm-23_r03.zip;
+      sha1 = "7bb8768ec4333500192fd9627d4234f505fa98dc";
+    };
+  };
 }