commit 344f2524fc66be97b357469ddaf4eef5dd240a04
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 06 00:28:16 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 06 00:28:16 2018 +0000
tree 6ac7176300b63282c0d7969de5e9310ace6ccc7a
parent 8b86ca8827d24b0bcc2c3a26212f836964b513cc
parent 9b7c1e4393b1d1f6af95a650b4e162dfcf3f0899

Merge "Fix pre-extracted PDKs"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 0e38dbe..c1ea5a8 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -532,8 +532,8 @@
 ifdef PDK_FUSION_PLATFORM_ZIP
 TARGET_BUILD_PDK := true
 ifeq (,$(wildcard $(PDK_FUSION_PLATFORM_ZIP)))
-  ifneq (,$(wildcard $(dir $(PDK_FUSION_PLATFORM_ZIP))/pdk.mk))
-    PDK_FUSION_PLATFORM_DIR := $(dir $(PDK_FUSION_PLATFORM_ZIP))
+  ifneq (,$(wildcard $(patsubst %.zip,%,$(PDK_FUSION_PLATFORM_ZIP))/pdk.mk))
+    PDK_FUSION_PLATFORM_DIR := $(patsubst %.zip,%,$(PDK_FUSION_PLATFORM_ZIP))
     PDK_FUSION_PLATFORM_ZIP :=
   else
     $(error Cannot find file $(PDK_FUSION_PLATFORM_ZIP).)

core/pdk_fusion_modules.mk

diff --git a/core/pdk_fusion_modules.mk b/core/pdk_fusion_modules.mk
index 9aabd0f..235acf9 100644
--- a/core/pdk_fusion_modules.mk
+++ b/core/pdk_fusion_modules.mk
@@ -37,12 +37,14 @@
 
 # The source prebuilts are extracted in the rule of _pdk_fusion_stamp.
 # Use a touch rule to establish the dependency.
+ifndef PDK_FUSION_PLATFORM_DIR
 $(3) $(11) : $(_pdk_fusion_stamp)
 	$(hide) if [ ! -f $$@ ]; then \
 	  echo 'Error: $$@ does not exist. Check your platform.zip.' 1>&2; \
 	  exit 1; \
 	fi
 	$(hide) touch $$@
+endif
 endef
 
 # We don't have a LOCAL_PATH for the auto-generated modules, so let it be the $(BUILD_SYSTEM).