commit 0640d1551eeaba4cdff68633ebcf6c789d6541b8
author David Turner <digit@android.com> Wed May 21 11:03:01 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 21 11:03:01 2014 +0000
tree 673c29522f09d0fff1fecd9fd9ea6be896d4be27
parent b4c45275388ee38c0dafbc819375a1c95e632415
parent 874512319361370762ddbe02039077ad5ea377b6

Merge "Read config.ini for Android build too" into idea133

android/avd/info.c

diff --git a/android/avd/info.c b/android/avd/info.c
index 56f46e1..67e1c73 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -896,13 +896,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 */