summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-17 23:32:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-17 23:32:26 +0000
commit0ad401297dcc5479015baf32b4f80170ffed203b (patch)
tree3fccc89118bd6555e296dea261dc03f2a2958097
parent1dafaf975636480dd42c57ef2c3b806739325ef8 (diff)
parentdde6053ebebcf6d836308dc80623099195cd5e0b (diff)
downloadandroid_frameworks_wilhelm-0ad401297dcc5479015baf32b4f80170ffed203b.tar.gz
android_frameworks_wilhelm-0ad401297dcc5479015baf32b4f80170ffed203b.tar.bz2
android_frameworks_wilhelm-0ad401297dcc5479015baf32b4f80170ffed203b.zip
am dde6053e: Merge "Only build libwilhelm, libOpenSLES, libOpenMAXAL in 32-bit"
* commit 'dde6053ebebcf6d836308dc80623099195cd5e0b': Only build libwilhelm, libOpenSLES, libOpenMAXAL in 32-bit
-rw-r--r--src/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk
index 7e8ebf2..0608dd3 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -191,6 +191,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE := libwilhelm
LOCAL_MODULE_TAGS := optional
+LOCAL_32_BIT_ONLY := true
ifeq ($(TARGET_BUILD_VARIANT),userdebug)
LOCAL_CFLAGS += -DUSERDEBUG_BUILD=1
@@ -209,6 +210,7 @@ LOCAL_C_INCLUDES:= \
LOCAL_MODULE := libOpenSLES
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_TAGS := optional
+LOCAL_32_BIT_ONLY := true
LOCAL_CFLAGS += -x c++ -DLI_API= -fvisibility=hidden -UNDEBUG \
-DSL_API='__attribute__((visibility("default")))'
LOCAL_SHARED_LIBRARIES := libwilhelm liblog
@@ -224,6 +226,7 @@ LOCAL_C_INCLUDES:= \
LOCAL_MODULE := libOpenMAXAL
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_TAGS := optional
+LOCAL_32_BIT_ONLY := true
LOCAL_CFLAGS += -x c++ -DLI_API= -fvisibility=hidden -UNDEBUG \
-DXA_API='__attribute__((visibility("default")))'
LOCAL_SHARED_LIBRARIES := libwilhelm liblog