diff options
| author | Keun young Park <keunyoung@google.com> | 2012-06-18 12:46:46 -0700 |
|---|---|---|
| committer | Keun young Park <keunyoung@google.com> | 2012-06-18 14:44:54 -0700 |
| commit | f4d1438d859bbbc289b55ba28c62de73f8c83fd5 (patch) | |
| tree | 5cf6e8b3bccd543400fcb3994be6156dd089f9ed /core/pdk_config.mk | |
| parent | 50724a39b7a5087f59584ae4f3a2f4c299889fe9 (diff) | |
| download | build-f4d1438d859bbbc289b55ba28c62de73f8c83fd5.zip build-f4d1438d859bbbc289b55ba28c62de73f8c83fd5.tar.gz build-f4d1438d859bbbc289b55ba28c62de73f8c83fd5.tar.bz2 | |
clean up pdk_config.mk
- define ...JAVA_ZIP_... variables only when necessary
- fix missed case for TARGET_BUILD_JAVA_SUPPORT_LEVEL definition
Change-Id: I4f491ff212fd1e973a77499bbf3fd8d1940bb1f8
Diffstat (limited to 'core/pdk_config.mk')
| -rw-r--r-- | core/pdk_config.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 9df2ce2..71ddf7e 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -33,7 +33,7 @@ endif endif # fusion endif # pdk or fusion - +ifneq (,$(filter platform-java, $(MAKECMDGOALS))$(PDK_FUSION_PLATFORM_ZIP)) # additional items to add to platform.zip for platform-java build # For these dirs, add classes.jar and javalib.jar from the dir to platform.zip # all paths under out dir @@ -50,9 +50,10 @@ PDK_PLATFORM_JAVA_ZIP_CONTENTS := \ target/common/obj/APPS/framework-res_intermediates/src/R.stamp PDK_PLATFORM_JAVA_ZIP_CONTENTS += $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\ $(lib_dir)/classes.jar $(lib_dir)/javalib.jar) +endif # platform-java or FUSION build # check and override java support level -ifeq ($(TARGET_BUILD_PDK),true) +ifneq ($(TARGET_BUILD_PDK)$(PDK_FUSION_PLATFORM_ZIP),) ifneq ($(wildcard external/proguard),) TARGET_BUILD_JAVA_SUPPORT_LEVEL := sdk else # no proguard @@ -136,7 +137,7 @@ ALL_PDK_FUSION_FILES := $(addprefix $(PRODUCT_OUT)/, $(_pdk_fusion_file_list)) endif # PDK_FUSION_PLATFORM_ZIP ifeq ($(TARGET_BUILD_PDK),true) - +$(info PDK TARGET_BUILD_JAVA_SUPPORT_LEVEL $(TARGET_BUILD_JAVA_SUPPORT_LEVEL)) ifeq ($(TARGET_BUILD_PDK_JAVA_PLATFORM),) # SDK used for Java build under PDK |