commit c6a12d776ae548c4290d76cb157807acb1ffb9f1
author Ying Wang <wangying@google.com> Wed Oct 22 13:12:13 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 22 13:12:13 2014 +0000
tree e0e304706861f76d5d11058548ffa3799cbe1cd9
parent f3e4b2c98e91c073e7612adb7adb16530ba00c7b
parent 46ba24c4a00156d6149be78928de962bf52e9502

am 46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."

* commit '46ba24c4a00156d6149be78928de962bf52e9502':
  Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.

core/prebuilt.mk

diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 33f5dc6..ba0e757 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -17,6 +17,7 @@
 my_skip_non_preferred_arch :=
 
 # check if first arch is supported
+LOCAL_2ND_ARCH_VAR_PREFIX :=
 include $(BUILD_SYSTEM)/module_arch_supported.mk
 ifeq ($(my_module_arch_supported),true)
 # first arch is supported