diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-10-22 16:56:03 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-22 16:56:03 -0700 |
| commit | f5392475b80a9c6dfa609ee197c2f9a476240732 (patch) | |
| tree | daf30acf7f5dfb4d6cf76dc675ca584f7b980e27 | |
| parent | a8c182abe14db29bce04308fb8f492566c923650 (diff) | |
| parent | 04a18e58114da2e7047a968fbcd456b0e02cb2ac (diff) | |
| download | external_qemu-f5392475b80a9c6dfa609ee197c2f9a476240732.zip external_qemu-f5392475b80a9c6dfa609ee197c2f9a476240732.tar.gz external_qemu-f5392475b80a9c6dfa609ee197c2f9a476240732.tar.bz2 | |
Merge "Fix ping version reporting."
| -rw-r--r-- | Makefile.android | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/Makefile.android b/Makefile.android index bbaa767..e5057d0 100644 --- a/Makefile.android +++ b/Makefile.android @@ -471,6 +471,26 @@ ifeq ($(BUILD_QEMU_AUDIO_LIB),true) endif # !QEMU_AUDIO_LIB ############################################################################## +# Common CFLAGS for UI and Core builds + +# add the build ID to the default macro definitions +UI_AND_CORE_CFLAGS := -DANDROID_BUILD_ID="$(strip $(BUILD_ID))-$(strip $(BUILD_NUMBER))" + +# For non-standalone builds, extract the major version number from the Android SDK +# tools revision number. +ifneq ($(BUILD_STANDALONE_EMULATOR),true) + ANDROID_SDK_TOOLS_REVISION := $(shell awk -F= '/Pkg.Revision/ { print $$2; }' sdk/files/tools_source.properties) +endif + +ANDROID_SDK_TOOLS_REVISION := $(strip $(ANDROID_SDK_TOOLS_REVISION)) +ifdef ANDROID_SDK_TOOLS_REVISION + UI_AND_CORE_CFLAGS += -DANDROID_SDK_TOOLS_REVISION=$(ANDROID_SDK_TOOLS_REVISION) +endif + +UI_AND_CORE_CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + + +############################################################################## # Build emulator core library. # This library contains "pure" emulation code separated from the intricacies # of the UI. @@ -530,6 +550,7 @@ ANDROID_SOURCES := qemu-setup.c LOCAL_SRC_FILES += $(ANDROID_SOURCES:%=android/%) LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(EMULATOR_CORE_CFLAGS) +LOCAL_CFLAGS += $(UI_AND_CORE_CFLAGS) include $(BUILD_HOST_STATIC_LIBRARY) @@ -582,25 +603,6 @@ LOCAL_MODULE_TAGS := debug include $(BUILD_HOST_STATIC_LIBRARY) ############################################################################## -# Common CFLAGS for UI and Core builds - -# add the build ID to the default macro definitions -UI_AND_CORE_CFLAGS = -DANDROID_BUILD_ID="$(strip $(BUILD_ID))-$(strip $(BUILD_NUMBER))" - -# For non-standalone builds, extract the major version number from the Android SDK -# tools revision number. -ifneq ($(BUILD_STANDALONE_EMULATOR),true) - ANDROID_SDK_TOOLS_REVISION := $(shell awk -F= '/Pkg.Revision/ { print $$2; }' sdk/files/tools_source.properties) -endif - -ANDROID_SDK_TOOLS_REVISION := $(strip $(ANDROID_SDK_TOOLS_REVISION)) -ifdef ANDROID_SDK_TOOLS_REVISION - UI_AND_CORE_CFLAGS += -DANDROID_SDK_TOOLS_REVISION=$(ANDROID_SDK_TOOLS_REVISION) -endif - -UI_AND_CORE_CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - -############################################################################## # lists of source files used to build the emulator core # @@ -1161,7 +1163,7 @@ LOCAL_MODULE := emulator-ui LOCAL_STATIC_LIBRARIES := emulator-uilib LOCAL_LDLIBS := $(MY_LDLIBS) -LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(EMULATOR_CORE_CFLAGS) $(EMULATOR_UI_CFLAGS) +LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) $(EMULATOR_UI_CFLAGS) # add the build ID to the default macro definitions LOCAL_CFLAGS += $(UI_AND_CORE_CFLAGS) -DCONFIG_STANDALONE_UI |