diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-12-03 14:11:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 14:11:38 -0800 |
| commit | e48bd04f0b59e5b6a8bea4718e3b2f587c711bba (patch) | |
| tree | dc50a020295572b4020ea147b0f3999d113ea523 /Makefile.android | |
| parent | 8fa4d03021927c765331f1e320226ae4923e9f6e (diff) | |
| parent | a383d02cb57dd7dadd382654175e51354073a139 (diff) | |
| download | external_qemu-e48bd04f0b59e5b6a8bea4718e3b2f587c711bba.zip external_qemu-e48bd04f0b59e5b6a8bea4718e3b2f587c711bba.tar.gz external_qemu-e48bd04f0b59e5b6a8bea4718e3b2f587c711bba.tar.bz2 | |
am a383d02c: Extract emulator major version number from SDK Tools package revision.
Merge commit 'a383d02cb57dd7dadd382654175e51354073a139' into eclair-plus-aosp
* commit 'a383d02cb57dd7dadd382654175e51354073a139':
Extract emulator major version number from SDK Tools package revision.
Diffstat (limited to 'Makefile.android')
| -rw-r--r-- | Makefile.android | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.android b/Makefile.android index 982c0cd..a9939c1 100644 --- a/Makefile.android +++ b/Makefile.android @@ -365,6 +365,17 @@ LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) # add the build ID to the default macro definitions LOCAL_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 + LOCAL_CFLAGS += -DANDROID_SDK_TOOLS_REVISION=$(ANDROID_SDK_TOOLS_REVISION) +endif + # include the Zlib sources # LOCAL_SRC_FILES += $(ZLIB_SOURCES) |