diff options
| author | Chad Jones <chadj@google.com> | 2014-04-28 10:58:35 -0700 |
|---|---|---|
| committer | Chad Jones <chadj@google.com> | 2014-05-02 12:39:02 -0700 |
| commit | 072923238d277bb24ffc82073d3e11d13a4de2fa (patch) | |
| tree | d24a1156d59112d21bafbb7807271c7c116dccf6 /core/pdk_config.mk | |
| parent | f38dd880c98464f33f214e3614fc5d4eb4fd6af8 (diff) | |
| download | build-072923238d277bb24ffc82073d3e11d13a4de2fa.zip build-072923238d277bb24ffc82073d3e11d13a4de2fa.tar.gz build-072923238d277bb24ffc82073d3e11d13a4de2fa.tar.bz2 | |
Expand PDK platform.zip auto-detect to named with vendor/pdk/PRODUCT
Change-Id: Ib813c9333541fa041a0902dab113fb7dc01f7e45
Diffstat (limited to 'core/pdk_config.mk')
| -rw-r--r-- | core/pdk_config.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index b0cccc9..f5fdd15 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -18,9 +18,14 @@ pdk fusion: $(DEFAULT_GOAL) # if PDK_FUSION_PLATFORM_ZIP is specified, do not override. ifndef PDK_FUSION_PLATFORM_ZIP +# Most PDK project paths should be using vendor/pdk/TARGET_DEVICE +# but some legacy ones (e.g. mini_armv7a_neon generic PDK) were setup +# with vendor/pdk/TARGET_PRODUCT. _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) +vendor/pdk/$(TARGET_DEVICE)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform/platform.zip \ +vendor/pdk/$(TARGET_PRODUCT)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform/platform.zip \ +vendor/pdk/$(TARGET_PRODUCT)/$(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 |