diff options
| author | Keun young Park <keunyoung@google.com> | 2012-08-02 14:29:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-02 14:29:05 -0700 |
| commit | 15b2b0f711a824f4e4e8b72584b1fb8d19b3f123 (patch) | |
| tree | 45d4149ab646006a678e837c731ba3168ee00b83 | |
| parent | cdbf0292e435b46c764c19cba956b5f2e0d70751 (diff) | |
| parent | 4da8e127c736a2e97d35f8767b8a409d2bc84cc0 (diff) | |
| download | build-15b2b0f711a824f4e4e8b72584b1fb8d19b3f123.zip build-15b2b0f711a824f4e4e8b72584b1fb8d19b3f123.tar.gz build-15b2b0f711a824f4e4e8b72584b1fb8d19b3f123.tar.bz2 | |
Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev
| -rw-r--r-- | core/pdk_config.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 77e9133..894b626 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -5,9 +5,9 @@ pdk fusion: $(DEFAULT_GOAL) # What to build: # pdk fusion if: -# 1) the platform.zip exists in the default location +# 1) PDK_FUSION_PLATFORM_ZIP is passed in from the environment # or -# 2) PDK_FUSION_PLATFORM_ZIP is passed in from the environment +# 2) the platform.zip exists in the default location # or # 3) fusion is a command line build goal, # PDK_FUSION_PLATFORM_ZIP is needed anyway, then do we need the 'fusion' goal? @@ -16,13 +16,15 @@ pdk fusion: $(DEFAULT_GOAL) # or # 2) TARGET_BUILD_PDK is passed in from the environment -# TODO: what's the best default location? +# if PDK_FUSION_PLATFORM_ZIP is specified, do not override. +ifndef PDK_FUSION_PLATFORM_ZIP _pdk_fusion_default_platform_zip := vendor/pdk/$(TARGET_DEVICE)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform/platform.zip ifneq (,$(wildcard $(_pdk_fusion_default_platform_zip))) $(info $(_pdk_fusion_default_platform_zip) found, do a PDK fusion build.) PDK_FUSION_PLATFORM_ZIP := $(_pdk_fusion_default_platform_zip) TARGET_BUILD_PDK := true endif +endif # !PDK_FUSION_PLATFORM_ZIP ifneq (,$(filter pdk fusion, $(MAKECMDGOALS))) TARGET_BUILD_PDK := true |