diff options
| author | Keun young Park <keunyoung@google.com> | 2012-06-07 16:31:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 16:31:14 -0700 |
| commit | fe8cddea28bc5a5266ede2bd10b482dbe840c0bf (patch) | |
| tree | a565b858c3775392a416a27261396c92ea9814d6 /core | |
| parent | 748f9e3804834610a59081db4c2952dcb7ee00d4 (diff) | |
| parent | efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd (diff) | |
| download | build-fe8cddea28bc5a5266ede2bd10b482dbe840c0bf.zip build-fe8cddea28bc5a5266ede2bd10b482dbe840c0bf.tar.gz build-fe8cddea28bc5a5266ede2bd10b482dbe840c0bf.tar.bz2 | |
am efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
* commit 'efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
Diffstat (limited to 'core')
| -rw-r--r-- | core/java.mk | 2 | ||||
| -rw-r--r-- | core/main.mk | 8 | ||||
| -rw-r--r-- | core/pdk_config.mk | 21 | ||||
| -rw-r--r-- | core/user_tags.mk | 1 |
4 files changed, 27 insertions, 5 deletions
diff --git a/core/java.mk b/core/java.mk index 2b6851b..4e33ef2 100644 --- a/core/java.mk +++ b/core/java.mk @@ -4,7 +4,7 @@ # all_res_assets ifeq ($(TARGET_BUILD_PDK),true) -ifeq ($(TARGET_BUILD_PDK_JAVA),) +ifeq ($(TARGET_BUILD_PDK_JAVA_PLATFORM),) # LOCAL_SDK not defined or set to current ifeq ($(filter-out current,$(LOCAL_SDK_VERSION)),) LOCAL_SDK_VERSION := $(PDK_BUILD_SDK_VERSION) diff --git a/core/main.mk b/core/main.mk index 8a5b407..407a529 100644 --- a/core/main.mk +++ b/core/main.mk @@ -213,6 +213,14 @@ $(error stopping) endif # ----------------------------------------------------------------- +# Variable to check java support level inside PDK build. +# Not necessary if the components is not in PDK. +# not defined : not supported +# "sdk" : sdk API only +# "platform" : platform API supproted +TARGET_BUILD_JAVA_SUPPORT_LEVEL := platform + +# ----------------------------------------------------------------- # The pdk (Platform Development Kit) build include build/core/pdk_config.mk diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 492a9c4..9df2ce2 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -51,6 +51,15 @@ PDK_PLATFORM_JAVA_ZIP_CONTENTS := \ PDK_PLATFORM_JAVA_ZIP_CONTENTS += $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\ $(lib_dir)/classes.jar $(lib_dir)/javalib.jar) +# check and override java support level +ifeq ($(TARGET_BUILD_PDK),true) +ifneq ($(wildcard external/proguard),) +TARGET_BUILD_JAVA_SUPPORT_LEVEL := sdk +else # no proguard +TARGET_BUILD_JAVA_SUPPORT_LEVEL := +endif +# platform supprot is set after checking platform.zip +endif # PDK ifdef PDK_FUSION_PLATFORM_ZIP TARGET_BUILD_PDK := true @@ -67,8 +76,14 @@ _pdk_fusion_java_file_list := \ $(shell unzip -Z -1 $(PDK_FUSION_PLATFORM_ZIP) 'target/common/*' 2>/dev/null) _pdk_fusion_files := $(addprefix $(_pdk_fusion_intermediates)/,\ $(_pdk_fusion_file_list) $(_pdk_fusion_java_file_list)) + ifneq ($(_pdk_fusion_java_file_list),) -TARGET_BUILD_PDK_JAVA := true +# This represents whether java build can use platform API or not +# This should not be used in Android.mk +TARGET_BUILD_PDK_JAVA_PLATFORM := true +ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),) +TARGET_BUILD_JAVA_SUPPORT_LEVEL := platform +endif endif $(_pdk_fusion_stamp) : $(PDK_FUSION_PLATFORM_ZIP) @@ -91,7 +106,7 @@ $(PRODUCT_OUT)/% : $(_pdk_fusion_intermediates)/% $(_pdk_fusion_stamp) @mkdir -p $(dir $@) $(hide) cp -fpPR $< $@ -ifeq (true,$(TARGET_BUILD_PDK_JAVA)) +ifeq (true,$(TARGET_BUILD_PDK_JAVA_PLATFORM)) define JAVA_dependency_template $(OUT_DIR)/$(strip $(1)): $(_pdk_fusion_intermediates)/$(strip $(1)) $(OUT_DIR)/$(strip $(2)) \ @@ -122,7 +137,7 @@ endif # PDK_FUSION_PLATFORM_ZIP ifeq ($(TARGET_BUILD_PDK),true) -ifeq ($(TARGET_BUILD_PDK_JAVA),) +ifeq ($(TARGET_BUILD_PDK_JAVA_PLATFORM),) # SDK used for Java build under PDK PDK_BUILD_SDK_VERSION := $(lastword $(TARGET_AVAILABLE_SDK_VERSIONS)) diff --git a/core/user_tags.mk b/core/user_tags.mk index ca2594b..22582a1 100644 --- a/core/user_tags.mk +++ b/core/user_tags.mk @@ -217,7 +217,6 @@ GRANDFATHERED_USER_MODULES += \ libESR_Portable \ libESR_Shared \ libETC1 \ - libexif \ libext \ libext2_blkid \ libext2_blkid_host \ |