diff options
| author | keunyoung <keunyoung@google.com> | 2013-03-28 14:08:31 -0700 |
|---|---|---|
| committer | keunyoung <keunyoung@google.com> | 2013-03-28 15:20:38 -0700 |
| commit | 3b4856e842d3aec88a4a040836ce23b5dbe8957d (patch) | |
| tree | dd156af9dbc3bef3dda80944cffb3b186ad476f7 /core | |
| parent | d76ff19a0f358d1b6473c33157c5ace2128d9623 (diff) | |
| download | build-3b4856e842d3aec88a4a040836ce23b5dbe8957d.zip build-3b4856e842d3aec88a4a040836ce23b5dbe8957d.tar.gz build-3b4856e842d3aec88a4a040836ce23b5dbe8957d.tar.bz2 | |
find pdk platform.zip from full_ directory as well for aosp_ products
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
Diffstat (limited to 'core')
| -rw-r--r-- | core/pdk_config.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index afa5b74..41a82d4 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -18,12 +18,14 @@ pdk fusion: $(DEFAULT_GOAL) # 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) +_pdk_fusion_default_platform_zip = $(wildcard \ +vendor/pdk/$(TARGET_DEVICE)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform/platform.zip \ +vendor/pdk/$(TARGET_DEVICE)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform/platform.zip) +ifneq (,$(_pdk_fusion_default_platform_zip)) +PDK_FUSION_PLATFORM_ZIP := $(word 1, $(_pdk_fusion_default_platform_zip)) TARGET_BUILD_PDK := true -endif +$(info $(PDK_FUSION_PLATFORM_ZIP) found, do a PDK fusion build.) +endif # _pdk_fusion_default_platform_zip endif # !PDK_FUSION_PLATFORM_ZIP ifneq (,$(filter pdk fusion, $(MAKECMDGOALS))) |