diff options
| author | Luca Favatella <lucafavatella@users.noreply.github.com> | 2020-03-09 17:59:57 +0000 |
|---|---|---|
| committer | Luca Favatella <lucafavatella@users.noreply.github.com> | 2020-03-09 18:34:16 +0000 |
| commit | f01278dea254bd7308e21b9e470f1bd8ee006a8c (patch) | |
| tree | 355261fdfb148278321899be88fac1ac3c9afadf /pkgs/development/mobile | |
| parent | c50618898f4981947a7f6c57fb42b410a7dc98ba (diff) | |
androidenv: manually (!) delete more complex version of google images
This commit was built as a revert commit followed by deletion:
* Revert "androidenv: manually (!) delete oldest revision of google
images".
* Delete other revision.
Using `systemImageType = "google_apis_playstore"` (and `abiVersion =
"x86"` and `platformVersion = "28"` - that I expect resolved to
`97d9d4f4a2afa8b0f5d52e90748e19c10406ca93`), the symptom is:
```
Warning: Observed package id 'system-images;android-28;google_ndk_playstore;x86' in inconsistent location '/nix/store/...-androidsdk/libexec/android-sdk/system-images/android-28/google_apis_playstore/x86' (Expected '/nix/store/...-androidsdk/libexec/android-sdk/system-images/android-28/google_ndk_playstore/x86')
...
Error: Package path is not valid. Valid system image paths are:
system-images;android-28;google_ndk_playstore;x86
```
How is the actual image name `google_ndk_playstore` when the fetched
image has id `google_apis_playstore`?
Attempt keeping - of the two images - the one that looks simpler.
For the `"28".google_apis."x86"` images, in the XML the differences
are: more complex license (what is `arm-dbt`?); higher emulator.
Namely:
```
<uses-license ref="android-sdk-license"/>
<dependencies>
<dependency path="patcher;v4"/>
<dependency path="emulator">
<min-revision>
<major>27</major>
<minor>1</minor>
<micro>7</micro>
...
<uses-license ref="android-sdk-arm-dbt-license"/>
<dependencies>
<dependency path="patcher;v4"/>
<dependency path="emulator">
<min-revision>
<major>29</major>
<minor>1</minor>
<micro>12</micro>
```
Analogously for `"28".google_apis_playstore."x86"`.
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix index a31b78b702e0..68af1ea56895 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix @@ -327,8 +327,8 @@ revision = "28-google_apis-x86"; displayName = "Google APIs Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r10.zip; - sha1 = "075e2253f1e93b49c134142a9717180dc7636685"; + url = https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r09.zip; + sha1 = "7c84ba5cbc009132ce38df52830c17b9bffc54bb"; }; }; "28".google_apis."x86_64" = { @@ -381,4 +381,4 @@ sha1 = "ae12e1c3e1b36043a299359850e9315f47262f81"; }; }; -} +}
\ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix index 20377efe0d4c..edc22ac2d7b6 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix @@ -47,8 +47,8 @@ revision = "28-google_apis_playstore-x86"; displayName = "Google Play Intel x86 Atom System Image"; archives.all = fetchurl { - url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r09.zip; - sha1 = "97d9d4f4a2afa8b0f5d52e90748e19c10406ca93"; + url = https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r08.zip; + sha1 = "5381f9d52a3bf1967c9c92a25b20012cd68764c8"; }; }; "28".google_apis_playstore."x86_64" = { |