Generate temporary hardware.ini from configuration settings.

This patch generates a temporary hardware.ini from the hardware
configuration. The idea is to move as much hw config info as possible
to a single file that the core can read.

Other patches will change how various config info is passed to the
core, from command-line options to the generated hardware.ini.

1 files changed, 26 insertions, 0 deletions

diff --git a/android/main-ui.c b/android/main-ui.c
index ac5bfbe..541d83b 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -48,6 +48,7 @@
 #include "android/utils/bufprint.h"
 #include "android/utils/dirscanner.h"
 #include "android/utils/path.h"
+#include "android/utils/tempfile.h"
 
 #include "android/cmdline-option.h"
 #include "android/help.h"
@@ -1944,6 +1945,31 @@ int main(int argc, char **argv)
     }
     args[n] = 0;
 
+    /* Generate a temporary hardware.ini for this AVD. The real hardware
+     * configuration is ususally stored in several files, e.g. the AVD's
+     * config.ini plus the skin-specific hardware.ini.
+     *
+     * The new temp file will group all definitions and will be used to
+     * launch the core with the -android-hw <file> option.
+     */
+    {
+        TempFile*  tempHw = tempfile_create();
+        if (tempHw == NULL) {
+            derror("Could not create temporary hardware.ini: %s", strerror(errno));
+            exit(2);
+        }
+
+        const char* tempHwPath = tempfile_path(tempHw);
+        IniFile*    hwIni      = iniFile_newFromMemory("", NULL);
+        androidHwConfig_write(hw, hwIni);
+        if (iniFile_saveToFile(hwIni, tempHwPath) < 0) {
+            derror("Could not write temporary hardware.ini: %s", tempHwPath);
+            exit(2);
+        }
+        args[n++] = "-android-hw";
+        args[n++] = strdup(tempHwPath);
+    }
+
     if(VERBOSE_CHECK(init)) {
         int i;
         printf("QEMU options list:\n");