summaryrefslogtreecommitdiffstats
path: root/core/main.mk
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-06-18 20:24:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-18 20:24:56 +0000
commita1ac47367636c0473156679f8f30af626df7da85 (patch)
tree042a20906c6758a6cb3ffa69aa6887e75e023ef3 /core/main.mk
parent88440c536ba0cfdd42e88378c952eb56f918f4a8 (diff)
parentb110da5f2bf9cf105dd675648075d13c942d1892 (diff)
downloadbuild-a1ac47367636c0473156679f8f30af626df7da85.zip
build-a1ac47367636c0473156679f8f30af626df7da85.tar.gz
build-a1ac47367636c0473156679f8f30af626df7da85.tar.bz2
am b110da5f: am 9d8854e3: Merge "build: delete 64-bit blacklist"
* commit 'b110da5f2bf9cf105dd675648075d13c942d1892': build: delete 64-bit blacklist
Diffstat (limited to 'core/main.mk')
-rw-r--r--core/main.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/main.mk b/core/main.mk
index 747316f..29ec231 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -92,8 +92,6 @@ include $(BUILD_SYSTEM)/help.mk
# and host information.
include $(BUILD_SYSTEM)/config.mk
-include $(BUILD_SYSTEM)/64_bit_blacklist.mk
-
# This allows us to force a clean build - included after the config.mk
# environment setup is done, but before we generate any dependencies. This
# file does the rm -rf inline so the deps which are all done below will