diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-29 19:58:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-09-29 19:58:50 +0000 |
| commit | 00e86b08fa6988cfaa2c1914d790cf4fb5e570ec (patch) | |
| tree | d556a7ea2e3dd63981d33c61f024acd1603bea1d | |
| parent | 3c88e5615962190045d9f52269a9a7178d96691c (diff) | |
| parent | f1629ff683628b108b1b18c41937362e3f58be77 (diff) | |
| download | qemu-snap-temp-L58800000956862641.tar.gz | |
Merge "Merge cherrypicks of [2234812, 2237965, 2238997] into emu-31-release." into emu-31-releasesnap-temp-L88600000956871015snap-temp-L78100000956867675snap-temp-L58800000956862641snap-temp-L32900000956863286snap-temp-L18200000956861452
| -rwxr-xr-x | android-qemu2-glue/main.cpp | 3 | ||||
| -rw-r--r-- | android/android-emu/android/avd/info.c | 2 | ||||
| -rw-r--r-- | android/android-emu/android/avd/util.c | 10 | ||||
| -rw-r--r-- | mac.source.properties | 2 | ||||
| -rw-r--r-- | source.properties | 2 | ||||
| -rw-r--r-- | win.source.properties | 2 |
6 files changed, 13 insertions, 8 deletions
diff --git a/android-qemu2-glue/main.cpp b/android-qemu2-glue/main.cpp index e737d004e1..da9e2ac539 100755 --- a/android-qemu2-glue/main.cpp +++ b/android-qemu2-glue/main.cpp @@ -1818,7 +1818,8 @@ extern "C" int main(int argc, char** argv) { // studio avd manager does not allow user to change partition size, set a // lower limit to 6GB. constexpr auto kMinPlaystoreImageSize = 6LL * 1024 * 1024 * 1024; - if (fc::isEnabled(fc::PlayStoreImage)) { + const int myApiLevel = avd ? avdInfo_getApiLevel(avd) : 1000; + if (myApiLevel >= 24 || fc::isEnabled(fc::PlayStoreImage)) { if (firstTimeSetup && android_hw->disk_dataPartition_size < kMinPlaystoreImageSize) { android_hw->disk_dataPartition_size = kMinPlaystoreImageSize; diff --git a/android/android-emu/android/avd/info.c b/android/android-emu/android/avd/info.c index 6c70fe0b89..9f8321fd1b 100644 --- a/android/android-emu/android/avd/info.c +++ b/android/android-emu/android/avd/info.c @@ -504,7 +504,7 @@ _avdInfo_getContentPath( AvdInfo* i ) { const char* relPath = iniFile_getString(i->rootIni, ROOT_REL_PATH_KEY, NULL); if (relPath != NULL) { - p = bufprint_config_path(temp, end); + p = bufprint_avd_home_path(temp, end); p = bufprint(p, end, PATH_SEP "%s", relPath); if (p < end && path_is_dir(temp)) { str_reset(&i->contentPath, temp); diff --git a/android/android-emu/android/avd/util.c b/android/android-emu/android/avd/util.c index 3ab846e94f..88e59f8d9b 100644 --- a/android/android-emu/android/avd/util.c +++ b/android/android-emu/android/avd/util.c @@ -79,11 +79,15 @@ path_getAvdContentPath(const char* avdName) if (!path_is_dir(avdPath)) { const char* relPath = iniFile_getString(ini, ROOT_REL_PATH_KEY, NULL); if (relPath != NULL) { - p = bufprint_config_path(temp, end); + p = bufprint_avd_home_path(temp, end); p = bufprint(p, end, PATH_SEP "%s", relPath); if (p < end && path_is_dir(temp)) { - AFREE(avdPath); - avdPath = ASTRDUP(temp); + char myPath[PATH_MAX]; + snprintf(myPath, sizeof(myPath), "%s" PATH_SEP "config.ini", temp); + if (path_exists(myPath)) { + AFREE(avdPath); + avdPath = ASTRDUP(temp); + } } } } diff --git a/mac.source.properties b/mac.source.properties index 0b7c6b4bf9..e95b139779 100644 --- a/mac.source.properties +++ b/mac.source.properties @@ -1,5 +1,5 @@ Pkg.UserSrc=false -Pkg.Revision=31.3.11 +Pkg.Revision=31.3.12 Pkg.Path=emulator Pkg.Desc=Android Emulator diff --git a/source.properties b/source.properties index cbd0d6c163..19661fc0ee 100644 --- a/source.properties +++ b/source.properties @@ -1,4 +1,4 @@ Pkg.UserSrc=false -Pkg.Revision=31.3.11 +Pkg.Revision=31.3.12 Pkg.Path=emulator Pkg.Desc=Android Emulator diff --git a/win.source.properties b/win.source.properties index cbd0d6c163..19661fc0ee 100644 --- a/win.source.properties +++ b/win.source.properties @@ -1,4 +1,4 @@ Pkg.UserSrc=false -Pkg.Revision=31.3.11 +Pkg.Revision=31.3.12 Pkg.Path=emulator Pkg.Desc=Android Emulator |