diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-20 00:54:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 00:54:07 +0000 |
| commit | 6d9ffdd133415d1e2750298106ffa4d9df2ed08c (patch) | |
| tree | 7a84d1e4ca3ef0bdc86f62effdabfd3ccc8ceaee /src | |
| parent | 1a90a1b28e1c842178c0dfbf6d6c90510d7390be (diff) | |
| parent | e773894b714268396562b942d1556a3575c5f97f (diff) | |
| download | android_frameworks_wilhelm-6d9ffdd133415d1e2750298106ffa4d9df2ed08c.tar.gz android_frameworks_wilhelm-6d9ffdd133415d1e2750298106ffa4d9df2ed08c.tar.bz2 android_frameworks_wilhelm-6d9ffdd133415d1e2750298106ffa4d9df2ed08c.zip | |
am e773894b: Merge "Revert "Only build libwilhelm, libOpenSLES, libOpenMAXAL in 32-bit""
* commit 'e773894b714268396562b942d1556a3575c5f97f':
Revert "Only build libwilhelm, libOpenSLES, libOpenMAXAL in 32-bit"
Diffstat (limited to 'src')
| -rw-r--r-- | src/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/Android.mk b/src/Android.mk index 0608dd3..7e8ebf2 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -191,7 +191,6 @@ 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 @@ -210,7 +209,6 @@ 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 @@ -226,7 +224,6 @@ 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 |