Defined EMULATOR_CORE_CFLAGS, and EMULATOR_UI_CFLAGS
Change-Id: I923304bd56417260cb244ac4a1d508aa1589bbb4
diff --git a/Makefile.android b/Makefile.android
index 7cd692b..2ef7c17 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -469,17 +469,18 @@
# don't remove the -fno-strict-aliasing, or you'll break things
# (e.g. slirp-android/network support)
#
-LOCAL_CFLAGS := -fno-PIC -Wno-sign-compare \
+EMULATOR_CORE_CFLAGS := -fno-PIC -Wno-sign-compare \
-fno-strict-aliasing -g -W -Wall -Wno-unused-parameter
-LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS)
+# Needed by the upstream code
+EMULATOR_CORE_CFLAGS += -DNEED_CPU_H
# Common includes for the emulator
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/ \
- -I$(LOCAL_PATH)/target-arm \
- -I$(LOCAL_PATH)/fpu \
- $(TCG_CFLAGS) \
- $(HW_CFLAGS) \
+EMULATOR_CORE_CFLAGS += -I$(LOCAL_PATH)/ \
+ -I$(LOCAL_PATH)/target-arm \
+ -I$(LOCAL_PATH)/fpu \
+ $(TCG_CFLAGS) \
+ $(HW_CFLAGS) \
# include slirp-android code, i.e. the user-level networking stuff
#
@@ -488,7 +489,7 @@
tcp_subr.c tcp_timer.c tftp.c udp.c
LOCAL_SRC_FILES += $(SLIRP_SOURCES:%=slirp-android/%)
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/slirp-android
+EMULATOR_CORE_CFLAGS += -I$(LOCAL_PATH)/slirp-android
# socket proxy support
#
@@ -499,13 +500,15 @@
proxy_http_rewriter.c \
LOCAL_SRC_FILES += $(PROXY_SOURCES:%=proxy/%)
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/proxy
+EMULATOR_CORE_CFLAGS += -I$(LOCAL_PATH)/proxy
# include telephony stuff
#
TELEPHONY_SOURCES := android_modem.c modem_driver.c gsm.c sim_card.c sysdeps_qemu.c sms.c remote_call.c
LOCAL_SRC_FILES += $(TELEPHONY_SOURCES:%=telephony/%)
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/telephony
+EMULATOR_CORE_CFLAGS += -I$(LOCAL_PATH)/telephony
+
+LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(EMULATOR_CORE_CFLAGS)
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -520,19 +523,12 @@
LOCAL_LDLIBS := $(MY_LDLIBS)
LOCAL_MODULE := emulator-ui
-LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS)
-
-# Common includes for the emulator
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/ \
- -I$(LOCAL_PATH)/target-arm \
- -I$(LOCAL_PATH)/fpu \
- $(TCG_CFLAGS) \
- $(HW_CFLAGS) \
+EMULATOR_UI_CFLAGS :=
# include the SDL sources
#
LOCAL_SRC_FILES += $(SDL_SOURCES) $(SDLMAIN_SOURCES)
-LOCAL_CFLAGS += $(SDL_CFLAGS) -I$(LOCAL_PATH)/$(SDL_DIR)/include
+EMULATOR_UI_CFLAGS += $(SDL_CFLAGS) -I$(LOCAL_PATH)/$(SDL_DIR)/include
# the skin support sources
#
@@ -549,7 +545,9 @@
surface.c \
LOCAL_SRC_FILES += $(SKIN_SOURCES:%=android/skin/%)
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/skin
+EMULATOR_UI_CFLAGS += -I$(LOCAL_PATH)/skin
+
+LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(EMULATOR_CORE_CFLAGS) $(EMULATOR_UI_CFLAGS)
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -567,13 +565,7 @@
LOCAL_STATIC_LIBRARIES += emulator-core emulator-ui
LOCAL_LDLIBS := $(MY_LDLIBS)
-# don't remove the -fno-strict-aliasing, or you'll break things
-# (e.g. slirp-android/network support)
-#
-LOCAL_CFLAGS := -fno-PIC -Wno-sign-compare \
- -fno-strict-aliasing -g -W -Wall -Wno-unused-parameter
-
-LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS)
+LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(EMULATOR_CORE_CFLAGS) $(EMULATOR_UI_CFLAGS)
# add the build ID to the default macro definitions
LOCAL_CFLAGS += -DANDROID_BUILD_ID="$(strip $(BUILD_ID))-$(strip $(BUILD_NUMBER))"
@@ -599,26 +591,6 @@
LOCAL_SRC_FILES += $(LIBPNG_SOURCES)
LOCAL_CFLAGS += $(LIBPNG_CFLAGS) -I$(LOCAL_PATH)/$(LIBPNG_DIR)
-# include the SDL sources
-#
-#LOCAL_SRC_FILES += $(SDL_SOURCES) $(SDLMAIN_SOURCES)
-LOCAL_CFLAGS += $(SDL_CFLAGS) -I$(LOCAL_PATH)/$(SDL_DIR)/include
-
-#
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/ \
- -I$(LOCAL_PATH)/target-arm \
- -I$(LOCAL_PATH)/fpu \
- $(TCG_CFLAGS) \
- $(HW_CFLAGS) \
-
-# Needed by the upstream code
-LOCAL_CFLAGS += -DNEED_CPU_H
-
-# Include emulator-core definitions
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/slirp-android
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/proxy
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/telephony
-
# include sound support source files. we first try to see if we have a prebuilt audio
# library. if not, we build things the "hard" way.
#
