am 0d08449c: Merge "Amend 64 bit blacklist."

* commit '0d08449c0c09c4a24be13b3ac89f4e34369d3b4c':
  Amend 64 bit blacklist.
This commit is contained in:
Narayan Kamath
2014-03-03 03:59:49 -08:00
committed by Android Git Automerger

View File

@@ -2,31 +2,24 @@ ifneq ($(TARGET_2ND_ARCH),)
# 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 @@ _64_bit_directory_blacklist += \
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))