diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-05-31 22:41:29 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-31 22:41:29 -0700 |
| commit | d812e574932a0ed386165532868a6854e8c1b331 (patch) | |
| tree | c65bfc8e7ababc8cd72462d5af7544da6d091e3c | |
| parent | 3d218582b2edf2d7cdd0dca038814753efa415ff (diff) | |
| parent | d00f7c4b4cbd09aa9fdcd484f0eb764417134657 (diff) | |
| download | external_qemu-d812e574932a0ed386165532868a6854e8c1b331.zip external_qemu-d812e574932a0ed386165532868a6854e8c1b331.tar.gz external_qemu-d812e574932a0ed386165532868a6854e8c1b331.tar.bz2 | |
Merge "fix BUILD_DEBUG_EMULATOR build"
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | Makefile.android | 5 | ||||
| -rw-r--r-- | distrib/libpng-1.2.19/sources.make | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 0bfecdc..b64769e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -1,3 +1,6 @@ # This empty file is here solely for the purpose of optimizing the Android build # Please keep it there, and empty, thanks :-) # + +$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/obj/{SHARED,STATIC}_LIBRARIES/emulator*) +$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/obj/EXECUTABLES/emulator*) diff --git a/Makefile.android b/Makefile.android index d61264b..00faa1c 100644 --- a/Makefile.android +++ b/Makefile.android @@ -39,8 +39,9 @@ MY_CFLAGS := $(CONFIG_INCLUDES) $(MY_OPTIM) # Overwrite configuration for debug builds. # ifeq ($(BUILD_DEBUG_EMULATOR),true) - MY_CFLAGS := $(CONFIG_INCLUDES) -O0 -g \ - -fno-PIC -falign-functions=0 + MY_CFLAGS := $(CONFIG_INCLUDES) + MY_CFLAGS += -O0 -g + MY_CFLAGS += -fno-PIC -falign-functions=0 endif MY_LDLIBS := diff --git a/distrib/libpng-1.2.19/sources.make b/distrib/libpng-1.2.19/sources.make index f512f7b..4d11126 100644 --- a/distrib/libpng-1.2.19/sources.make +++ b/distrib/libpng-1.2.19/sources.make @@ -7,8 +7,10 @@ LIBPNG_SOURCES := png.c pngerror.c pngget.c pngmem.c pngpread.c pngread.c \ # Enable MMX code path for x86, except on Darwin where it fails PNG_MMX := no ifeq ($(HOST_ARCH),x86) +ifneq ($(BUILD_DEBUG_EMULATOR),true) PNG_MMX := yes endif +endif ifeq ($(HOST_OS),darwin) PNG_MMX := no endif @@ -20,4 +22,3 @@ else endif LIBPNG_SOURCES := $(LIBPNG_SOURCES:%=$(LIBPNG_DIR)/%) - |