am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"

* commit '97542cc9bf4b2e5fad1576fa7262fa531bcf3fe4':
  Don't blacklist all of frameworks/av for 64-bit
This commit is contained in:
Glenn Kasten 2014-03-18 14:48:36 -07:00 committed by Android Git Automerger
commit 023c286563
1 changed files with 5 additions and 4 deletions

View File

@ -16,7 +16,7 @@ _64_bit_directory_blacklist += \
# misc build errors
_64_bit_directory_blacklist += \
frameworks/av \
frameworks/av/media/libstagefright/codecs \
frameworks/base \
device/generic/goldfish/opengl \
device/generic/goldfish/camera \
@ -24,12 +24,13 @@ _64_bit_directory_blacklist += \
# depends on frameworks/av
_64_bit_directory_blacklist += \
external/srec \
hardware/libhardware_legacy/audio \
hardware/libhardware/modules/audio_remote_submix \
frameworks/wilhelm \
frameworks/opt \
frameworks/ex \
# not needed yet, and too many directories to blacklist individually
_64_bit_directory_blacklist += \
frameworks/av/media/libeffects \
_64_bit_directory_blacklist_pattern := $(addsuffix %,$(_64_bit_directory_blacklist))
define directory_is_64_bit_blacklisted