aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-08-23 02:28:22 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-23 02:28:22 -0700
commit1ffbb6b1f80ccd557080b4e91b35e18b97f981e6 (patch)
treeab9801e19c6acc57865c8a7891092b0a0f5743ce
parent08c435499f131d82b5d887dd836cfddbc3384f4c (diff)
parent33da99a33cab75287d483c2602bb2e40b34b666a (diff)
downloadexternal_qemu-1ffbb6b1f80ccd557080b4e91b35e18b97f981e6.zip
external_qemu-1ffbb6b1f80ccd557080b4e91b35e18b97f981e6.tar.gz
external_qemu-1ffbb6b1f80ccd557080b4e91b35e18b97f981e6.tar.bz2
Merge "Fix double optimization on buildsystem for emulator"
-rw-r--r--Makefile.android7
-rw-r--r--Makefile.common54
-rw-r--r--Makefile.target3
3 files changed, 45 insertions, 19 deletions
diff --git a/Makefile.android b/Makefile.android
index 1f91b64..181986a 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -35,12 +35,7 @@ MY_CC := $(HOST_CC)
MY_CXX := $(HOST_CXX)
MY_AR := $(HOST_AR)
-MY_OPTIM := -O2 -g -fno-PIC -falign-functions=0 -fomit-frame-pointer
-ifeq ($(BUILD_DEBUG_EMULATOR),true)
- MY_OPTIM := -O0 -g
-endif
-
-MY_CFLAGS := $(CONFIG_INCLUDES) $(MY_OPTIM)
+MY_CFLAGS := $(CONFIG_INCLUDES) -O2 -g -fno-PIC -falign-functions=0 -fomit-frame-pointer
# Overwrite configuration for debug builds.
#
diff --git a/Makefile.common b/Makefile.common
index 233be48..cbb22e5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -314,18 +314,6 @@ EMULATOR_LIBQEMU_CFLAGS :=
common_LOCAL_CFLAGS += $(EMULATOR_COMMON_CFLAGS)
-###########################################################
-# Jpeg configuration
-#
-LIBJPEG_DIR := distrib/jpeg-6b
-include $(LOCAL_PATH)/$(LIBJPEG_DIR)/sources.make
-
-EMULATOR_LIBQEMU_CFLAGS += \
- $(LIBJPEG_CFLAGS) \
- -I$(LOCAL_PATH)/$(LIBJPEG_DIR)
-
-common_LOCAL_SRC_FILES += $(LIBJPEG_SOURCES)
-
AUDIO_SOURCES := noaudio.c wavaudio.c wavcapture.c mixeng.c
AUDIO_CFLAGS := -I$(LOCAL_PATH)/audio -DHAS_AUDIO
AUDIO_LDLIBS :=
@@ -517,7 +505,7 @@ endif
common_LOCAL_SRC_FILES += $(CORE_MISC_SOURCES)
# Required
-common_LOCAL_CFLAGS += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1
+common_LOCAL_CFLAGS += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1 -I$(LOCAL_PATH)/distrib/jpeg-6b
SLIRP_SOURCES := \
bootp.c \
@@ -664,6 +652,46 @@ endif
BLOCK_CFLAGS += $(EMULATOR_COMMON_CFLAGS)
BLOCK_CFLAGS += -DCONFIG_BDRV_WHITELIST=""
+##############################################################################
+##############################################################################
+###
+### emulator-libjpeg: TARGET-INDEPENDENT QEMU FUNCTIONS
+###
+### THESE ARE USED BY EVERYTHING EXCEPT 'emulator-ui'
+###
+
+common_LOCAL_CFLAGS =
+common_LOCAL_SRC_FILES =
+
+###########################################################
+# Jpeg configuration
+#
+LIBJPEG_DIR := distrib/jpeg-6b
+include $(LOCAL_PATH)/$(LIBJPEG_DIR)/sources.make
+
+common_LOCAL_SRC_FILES += $(LIBJPEG_SOURCES)
+
+common_LOCAL_CFLAGS += \
+ $(LIBJPEG_CFLAGS) \
+ -I$(LOCAL_PATH)/$(LIBJPEG_DIR)
+
+## one for 32-bit
+$(call start-emulator-library, emulator-libjpeg)
+LOCAL_CFLAGS += $(common_LOCAL_CFLAGS)
+LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES)
+$(call end-emulator-library)
+
+
+## another for 64-bit, see note in emulator64-common
+ifeq ($(HOST_OS),linux)
+ ifneq ($(BUILD_STANDALONE_EMULATOR),true)
+ $(call start-emulator-library, emulator64-libjpeg)
+ LOCAL_CFLAGS += $(common_LOCAL_CFLAGS) -m64
+ LOCAL_SRC_FILES += $(common_LOCAL_SRC_FILES)
+ $(call end-emulator-library)
+ endif # BUILD_STANDALONE_EMULATOR == nil
+endif # HOST_OS == linux
+
##############################################################################
##############################################################################
diff --git a/Makefile.target b/Makefile.target
index 4d8c2fd..3e45c61 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -318,6 +318,7 @@ LOCAL_CFLAGS += -Wno-missing-field-initializers
LOCAL_STATIC_LIBRARIES := \
emulator-libqemu \
emulator-target-$(EMULATOR_TARGET_CPU) \
+ emulator-libjpeg \
emulator-libelff \
emulator-common
@@ -455,6 +456,7 @@ LOCAL_STATIC_LIBRARIES += \
emulator-libui \
emulator-libqemu \
emulator-target-$(EMULATOR_TARGET_CPU) \
+ emulator-libjpeg \
emulator-libelff \
emulator-common \
$(SDL_STATIC_LIBRARIES)
@@ -480,6 +482,7 @@ ifneq ($(filter linux darwin,$(HOST_OS)),)
emulator64-libui \
emulator64-libqemu \
emulator64-target-$(EMULATOR_TARGET_CPU) \
+ emulator64-libjpeg \
emulator64-libelff \
emulator64-common \
$(SDL_STATIC_LIBRARIES_64)