commit 6338cf39a8985a86923a6325457086f701bdc1bc
author David Turner <digit@android.com> Wed May 21 11:11:39 2014 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 21 11:11:39 2014 +0000
tree 18b6e8723e47300dc498d859646ff2be9ef41d06
parent 989239963eac90b17caa1bc737cc0764a62049c5
parent 0640d1551eeaba4cdff68633ebcf6c789d6541b8

Merge "Read config.ini for Android build too" into idea133
 Auto-merge: 0640d15

* commit '0640d1551eeaba4cdff68633ebcf6c789d6541b8':
  Read config.ini for Android build too

android/avd/info.c

diff --git a/android/avd/info.c b/android/avd/info.c
index 29ff1db..6e97703 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -898,13 +898,12 @@
 
     _avdInfo_extractBuildProperties(i);
 
-    /* TODO: find a way to provide better information from the build files */
     i->deviceName = ASTRDUP("<build>");
 
-    /* There is no config.ini in the build */
-    i->configIni = NULL;
-
-    if (_avdInfo_getCoreHwIniPath(i, i->androidOut) < 0 )
+    /* out/target/product/<name>/config.ini, if exists, provide configuration
+     * from build files. */
+    if (_avdInfo_getConfigIni(i) < 0 ||
+        _avdInfo_getCoreHwIniPath(i, i->androidOut) < 0)
         goto FAIL;
 
     /* Read the build skin's hardware.ini, if any */