summaryrefslogtreecommitdiffstats
path: root/core/clear_vars.mk
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-03-27 00:14:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 00:14:05 +0000
commit6443630ccaa5866a9181f869d4f21ddc728d2f7e (patch)
tree1d56dfb4ef1f13ebd1d530005d1a6f5484bac4f7 /core/clear_vars.mk
parent86c0cf68c843ae5a920d40b5c3ec3d6891ebb337 (diff)
parent441e9452488ccb98f7b0a7690b86fcdff733e5f0 (diff)
downloadbuild-6443630ccaa5866a9181f869d4f21ddc728d2f7e.zip
build-6443630ccaa5866a9181f869d4f21ddc728d2f7e.tar.gz
build-6443630ccaa5866a9181f869d4f21ddc728d2f7e.tar.bz2
am 441e9452: resolved conflicts for merge of f3e25fea to klp-modular-dev-plus-aosp
* commit '441e9452488ccb98f7b0a7690b86fcdff733e5f0': add support for LOCAL_MULTILIB
Diffstat (limited to 'core/clear_vars.mk')
-rw-r--r--core/clear_vars.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index e4d4a50..82f1f6d 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -205,6 +205,7 @@ LOCAL_MODULE_PATH_32:=
LOCAL_MODULE_PATH_64:=
LOCAL_MODULE_STEM_32:=
LOCAL_MODULE_STEM_64:=
+LOCAL_MULTILIB:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time.