Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69e8d677 authored by keunyoung's avatar keunyoung Committed by Android Git Automerger
Browse files

am aa0d1a17: am 6f79520b: Merge "find pdk platform.zip from full_ directory as... 

am aa0d1a17: am 6f79520b: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev

* commit 'aa0d1a17':
  find pdk platform.zip from full_ directory as well for aosp_ products
parents 7a9967ac aa0d1a17

core/pdk_config.mk

+7 −5
Original line number Diff line number Diff line
@@ -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)))