keep PLATFORM_ZIP specified explicitly

- the old behaviour was to override with default one, which makes
  trying different sets of platform.zip difficult if default one exists

Change-Id: I4c8ac2e44d9e7b48f77d628cce3edb20fbdf27e4
This commit is contained in:
Keun young Park 2012-08-02 12:51:59 -07:00
parent fad81e8997
commit 4da8e127c7
1 changed files with 5 additions and 3 deletions

View File

@ -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