Cleaned up build script from rebuilding locally generated sources

Also passed along -show-kernel option to the emulator core

Change-Id: Ic606a7a9cdac677cbd5ce9ca1a9f1a2b16da4dfa

4 files changed, 13 insertions, 66 deletions

diff --git a/Makefile.android b/Makefile.android
index a5e5de3..eaefa9a 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -966,7 +966,7 @@ include $(BUILD_HOST_EXECUTABLE)
 #
 include $(CLEAR_VARS)
 
-LOCAL_GENERATED_SOURCES :=
+LOCAL_GENERATED_SOURCES         := $(QEMU_GDBSTUB_XML_C) $(QEMU_MONITOR_H) $(QEMU_HW_CONFIG_DEFS_H)
 LOCAL_NO_DEFAULT_COMPILER_FLAGS := true
 LOCAL_CC                        := $(MY_CC)
 LOCAL_MODULE                    := qemu-android
@@ -1041,70 +1041,6 @@ $(ANDROID_ICON_PATH)/$(ANDROID_ICON_OBJ): $(ANDROID_ICON_PATH)/android_icon.rc
 LOCAL_PREBUILT_OBJ_FILES += images/$(ANDROID_ICON_OBJ)
 endif
 
-# qemu-options.h is generated from qemu-options.hx with the "hxtool" shell script
-#
-intermediates := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),true)
-
-QEMU_OPTIONS_H := $(intermediates)/qemu-options.h
-$(QEMU_OPTIONS_H): PRIVATE_PATH := $(LOCAL_PATH)
-$(QEMU_OPTIONS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PATH)/hxtool -h < $< > $@
-$(QEMU_OPTIONS_H): $(LOCAL_PATH)/qemu-options.hx $(LOCAL_PATH)/hxtool
-	$(transform-generated-source)
-
-$(intermediates)/vl-android.o: $(QEMU_OPTIONS_H)
-
-LOCAL_GENERATED_SOURCES += $(QEMU_OPTIONS_H)
-
-# qemu-monitor.h is generated from qemu-monitor.hx with the "hxtool" shell script
-#
-intermediates := $(call intermediates-dir-for,EXECUTABLES,$(LOCAL_MODULE),true)
-
-QEMU_MONITOR_H := $(intermediates)/qemu-monitor.h
-$(QEMU_MONITOR_H): PRIVATE_PATH := $(LOCAL_PATH)
-$(QEMU_MONITOR_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PATH)/hxtool -h < $< > $@
-$(QEMU_MONITOR_H): $(LOCAL_PATH)/qemu-monitor.hx $(LOCAL_PATH)/hxtool
-	$(transform-generated-source)
-
-$(intermediates)/vl-android.o: $(QEMU_MONITOR_H)
-
-LOCAL_GENERATED_SOURCES += $(QEMU_MONITOR_H)
-
-
-# gdbstub-xml.c contains C-compilable arrays corresponding to the content
-# of $(LOCAL_PATH)/gdb-xml/, and is generated with the 'feature_to_c.sh' script.
-#
-ifeq ($(QEMU_TARGET_XML_SOURCES),)
-    QEMU_TARGET_XML_SOURCES := arm-core arm-neon arm-vfp arm-vfp3
-    QEMU_TARGET_XML_SOURCES := $(QEMU_TARGET_XML_SOURCES:%=$(LOCAL_PATH)/gdb-xml/%.xml)
-endif
-
-QEMU_GDBSTUB_XML_C := $(intermediates)/gdbstub-xml.c
-$(QEMU_GDBSTUB_XML_C): PRIVATE_PATH := $(LOCAL_PATH)
-$(QEMU_GDBSTUB_XML_C): PRIVATE_SOURCES := $(TARGET_XML_SOURCES)
-$(QEMU_GDBSTUB_XML_C): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PATH)/feature_to_c.sh $@ $(QEMU_TARGET_XML_SOURCES)
-$(QEMU_GDBSTUB_XML_C): $(QEMU_TARGET_XML_SOURCES) $(LOCAL_PATH)/feature_to_c.sh
-	$(hide) rm -f $@
-	$(transform-generated-source)
-
-$(intermediates)/vl-android.o: $(QEMU_GDBSTUB_XML_C)
-
-LOCAL_GENERATED_SOURCES += $(QEMU_GDBSTUB_XML_C)
-
-# hw-config-defs.h is generated from android/avd/hardware-properties.ini
-#
-QEMU_HARDWARE_PROPERTIES_INI := $(LOCAL_PATH)/android/avd/hardware-properties.ini
-QEMU_HW_CONFIG_DEFS_H := $(LOCAL_PATH)/android/avd/hw-config-defs.h
-$(QEMU_HW_CONFIG_DEFS_H): PRIVATE_PATH := $(LOCAL_PATH)
-$(QEMU_HW_CONFIG_DEFS_H): PRIVATE_SOURCES := $(QEMU_HARDWARE_PROPERTIES_INI)
-$(QEMU_HW_CONFIG_DEFS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PATH)/android/tools/gen-hw-config.py $(QEMU_HARDWARE_PROPERTIES_INI) $@
-$(QEMU_HW_CONFIG_DEFS_H): $(QEMU_HARDWARE_PROPERTIES_INI) $(LOCAL_PATH)/android/tools/gen-hw-config.py
-	$(hide) rm -f $@
-	$(transform-generated-source)
-
-$(LOCAL_PATH)/android/avd/hw-config.h: $(QEMU_HW_CONFIG_DEFS_H)
-
-LOCAL_GENERATED_SOURCES += $(QEMU_HW_CONFIG_DEFS_H)
-
 # this is already done by the Android build system, but is done for the
 # benefit of the stand-alone one.
 #
diff --git a/android/main.c b/android/main.c
index 42c3a3f..f06d619 100644
--- a/android/main.c
+++ b/android/main.c
@@ -1503,8 +1503,10 @@ int main(int argc, char **argv)
     {
         AndroidKmsgFlags  flags = 0;
 
-        if (opts->show_kernel)
+        if (opts->show_kernel) {
             flags |= ANDROID_KMSG_PRINT_MESSAGES;
+            args[n++] = "-show-kernel";
+        }
 
         android_kmsg_init( flags );
         args[n++] = "-serial";
diff --git a/qemu-options.hx b/qemu-options.hx
index e810c5c..000e231 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1654,4 +1654,7 @@ DEF("audio-out", HAS_ARG, QEMU_OPTION_audio_out, \
 DEF("cpu-delay", HAS_ARG, QEMU_OPTION_cpu_delay, \
     "-cpu-delay <cpudelay> throttle CPU emulation\n")
 
+DEF("show-kernel", 0, QEMU_OPTION_show_kernel, \
+    "-show-kernel display kernel messages\n")
+
 #endif
diff --git a/vl-android.c b/vl-android.c
index c66e4e0..c136a07 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -355,6 +355,7 @@ char* android_op_memcheck = NULL;
 /* -dns-server option value. */
 char* android_op_dns_server = NULL;
 
+/* -radio option value. */
 char* android_op_radio = NULL;
 
 /* -gps option value. */
@@ -5892,6 +5893,7 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_android_hw:
                 android_op_hwini = (char*)optarg;
                 break;
+
             case QEMU_OPTION_dns_server:
                 android_op_dns_server = (char*)optarg;
                 break;
@@ -5920,6 +5922,10 @@ int main(int argc, char **argv, char **envp)
                 android_op_cpu_delay = (char*)optarg;
                 break;
 
+            case QEMU_OPTION_show_kernel:
+                android_kmsg_init(ANDROID_KMSG_PRINT_MESSAGES);
+                break;
+
 #ifdef CONFIG_MEMCHECK
             case QEMU_OPTION_android_memcheck:
                 android_op_memcheck = (char*)optarg;