diff options
author | Colin Cross <ccross@android.com> | 2014-03-20 21:05:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 21:05:40 +0000 |
commit | 63665f2ac4f25131728a7efff0a449ecdc3f4c50 (patch) | |
tree | 395dec9ab1b065c3038f013b9f7628a888f483f0 /cmds | |
parent | 52eb953278ad68ba5e5995feb1c8f8d43a7af4c9 (diff) | |
parent | a3633c25033b576ae160ea86194e4f7f20d82fe2 (diff) | |
download | frameworks_base-63665f2ac4f25131728a7efff0a449ecdc3f4c50.zip frameworks_base-63665f2ac4f25131728a7efff0a449ecdc3f4c50.tar.gz frameworks_base-63665f2ac4f25131728a7efff0a449ecdc3f4c50.tar.bz2 |
am a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit 'a3633c25033b576ae160ea86194e4f7f20d82fe2':
bootanimation: build 32-bit if 64-bit gl libraries are not available
Diffstat (limited to 'cmds')
-rw-r--r-- | cmds/bootanimation/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk index a4e2718..c4fe6cf 100644 --- a/cmds/bootanimation/Android.mk +++ b/cmds/bootanimation/Android.mk @@ -21,5 +21,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= bootanimation +ifdef TARGET_32_BIT_SURFACEFLINGER +LOCAL_32_BIT_ONLY := true +endif include $(BUILD_EXECUTABLE) |