StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up pdk_config.mk

Browse Source 
- define ...JAVA_ZIP_... variables only when necessary
- fix missed case for TARGET_BUILD_JAVA_SUPPORT_LEVEL definition

Change-Id: I4f491ff212fd1e973a77499bbf3fd8d1940bb1f8
This commit is contained in:
Keun young Park
2012-06-18 12:46:46 -07:00
parent 50724a39b7
commit f4d1438d85
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/pdk_config.mk
View File

@@ -33,7 +33,7 @@ endif
endif # fusion endif # fusion
endif # pdk or 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 # 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 # For these dirs, add classes.jar and javalib.jar from the dir to platform.zip
# all paths under out dir # all paths under out dir
@@ -50,9 +50,10 @@ PDK_PLATFORM_JAVA_ZIP_CONTENTS := \
target/common/obj/APPS/framework-res_intermediates/src/R.stamp 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),\ PDK_PLATFORM_JAVA_ZIP_CONTENTS += $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\
$(lib_dir)/classes.jar $(lib_dir)/javalib.jar) $(lib_dir)/classes.jar $(lib_dir)/javalib.jar)
endif # platform-java or FUSION build
# check and override java support level # check and override java support level
ifeq ($(TARGET_BUILD_PDK),true) ifneq ($(TARGET_BUILD_PDK)$(PDK_FUSION_PLATFORM_ZIP),)
ifneq ($(wildcard external/proguard),) ifneq ($(wildcard external/proguard),)
TARGET_BUILD_JAVA_SUPPORT_LEVEL := sdk TARGET_BUILD_JAVA_SUPPORT_LEVEL := sdk
else # no proguard else # no proguard
@@ -136,7 +137,7 @@ ALL_PDK_FUSION_FILES := $(addprefix $(PRODUCT_OUT)/, $(_pdk_fusion_file_list))
endif # PDK_FUSION_PLATFORM_ZIP endif # PDK_FUSION_PLATFORM_ZIP
ifeq ($(TARGET_BUILD_PDK),true) ifeq ($(TARGET_BUILD_PDK),true)
$(info PDK TARGET_BUILD_JAVA_SUPPORT_LEVEL $(TARGET_BUILD_JAVA_SUPPORT_LEVEL))
ifeq ($(TARGET_BUILD_PDK_JAVA_PLATFORM),) ifeq ($(TARGET_BUILD_PDK_JAVA_PLATFORM),)
# SDK used for Java build under PDK # SDK used for Java build under PDK