commit 58f462fccf4a0a1e20abd3dba2f63a42b0f0fdc3
author Ying Wang <wangying@google.com> Tue Feb 25 18:26:29 2014 -0800
committer Ying Wang <wangying@google.com> Tue Feb 25 18:32:27 2014 -0800
tree 96b8fc98b302577072b1bd89301262ea712432b1
parent 9dba192b76ee75c578a62dcef0160fc719a57914

Fix prebuilt library dependency for multilib build

Also we don't need to include module_arch_supported.mk again, if we are
currently substituting the source build with LOCAL_PREBUILT_MODULE_FILE.

Change-Id: I444b0397d74c3153b398a050b762e49418062a86

core/executable_internal.mk

diff --git a/core/executable_internal.mk b/core/executable_internal.mk
index 1edcd2c..a1ce7f2 100644
--- a/core/executable_internal.mk
+++ b/core/executable_internal.mk
@@ -17,7 +17,7 @@
 skip_build_from_source :=
 ifdef LOCAL_PREBUILT_MODULE_FILE
 ifeq (,$(call if-build-from-source,$(LOCAL_MODULE),$(LOCAL_PATH)))
-include $(BUILD_PREBUILT)
+include $(BUILD_SYSTEM)/prebuilt_internal.mk
 skip_build_from_source := true
 endif
 endif