Merge "Amend 64 bit blacklist."
diff --git a/core/64_bit_blacklist.mk b/core/64_bit_blacklist.mk
index 4302c47..0171e67 100644
--- a/core/64_bit_blacklist.mk
+++ b/core/64_bit_blacklist.mk
@@ -2,31 +2,24 @@
# JNI - needs 64-bit VM
_64_bit_directory_blacklist += \
- external/conscrypt \
- external/neven \
- external/svox \
- packages \
+ external/svox/ \
+ packages/
+
# Chromium/V8: needs 64-bit support
_64_bit_directory_blacklist += \
external/chromium \
external/chromium-libpac \
external/chromium_org \
- external/skia \
external/v8 \
frameworks/webview \
# misc build errors
_64_bit_directory_blacklist += \
- external/bluetooth/bluedroid \
external/oprofile/daemon \
external/oprofile/opcontrol \
frameworks/av \
frameworks/base \
- frameworks/ex \
- frameworks/ml \
- frameworks/opt \
- frameworks/wilhelm \
device/generic/goldfish/opengl \
device/generic/goldfish/camera \
@@ -35,6 +28,9 @@
external/srec \
hardware/libhardware_legacy/audio \
hardware/libhardware/modules/audio_remote_submix \
+ frameworks/wilhelm \
+ frameworks/opt \
+ frameworks/ex \
_64_bit_directory_blacklist_pattern := $(addsuffix %,$(_64_bit_directory_blacklist))