diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-06-23 12:19:20 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-06-23 12:19:20 -0700 |
| commit | c2c7377fbfcbf7cb87329511af1de5be578c6e77 (patch) | |
| tree | 77fd58e1db35304397476ded126e5a4283f71171 | |
| parent | ac395e1dff366240b8b0fa5ea4cdeb0cc7a8b797 (diff) | |
| parent | adc34fb9e9ad0700e9752ca67174c68925ca0c71 (diff) | |
| download | external_qemu-c2c7377fbfcbf7cb87329511af1de5be578c6e77.zip external_qemu-c2c7377fbfcbf7cb87329511af1de5be578c6e77.tar.gz external_qemu-c2c7377fbfcbf7cb87329511af1de5be578c6e77.tar.bz2 | |
Merge "Fix -sysdir handling."
| -rw-r--r-- | android/avd/info.c | 12 | ||||
| -rw-r--r-- | android/main-common.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/android/avd/info.c b/android/avd/info.c index 4df5969..f1514f2 100644 --- a/android/avd/info.c +++ b/android/avd/info.c @@ -1138,6 +1138,17 @@ avdInfo_getSkinInfo( AvdInfo* i, char** pSkinName, char** pSkinDir ) if (skinPath != NULL) break; } + + /* or in the parent directory of the system dir */ + { + char* parentDir = path_parent(i->androidOut, 1); + if (parentDir != NULL) { + skinPath = _checkSkinSkinsDir(parentDir, skinName); + AFREE(parentDir); + if (skinPath != NULL) + break; + } + } } /* look in the search paths. For each <dir> in the list, @@ -1158,6 +1169,7 @@ avdInfo_getSkinInfo( AvdInfo* i, char** pSkinName, char** pSkinDir ) } /* We didn't find anything ! */ + *pSkinName = skinName; return; } while (0); diff --git a/android/main-common.c b/android/main-common.c index 05a2cb0..94accf7 100644 --- a/android/main-common.c +++ b/android/main-common.c @@ -850,7 +850,7 @@ AvdInfo* createAVD(AndroidOptions* opts, int* inAndroidBuild) if (!opts->system) { opts->system = _getSdkSystemImage(opts->sysdir, "-image", "system.img"); - D("autoconfig: -image %s", opts->image); + D("autoconfig: -system %s", opts->system); } if (!opts->kernel) { |