summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-03-20 17:46:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 17:46:50 +0000
commit71a3d40d20c9507efab94260431e330558b90cd0 (patch)
treef6a131aec0ca2e6c5714e4a5971403dd3f99dbea /cmds
parent065b8fd1c388812a789be48aaa0a0f7918d2755d (diff)
parente4360c8e14d1ea362fb1d13b7a5c9bf003f3be00 (diff)
downloadframeworks_base-71a3d40d20c9507efab94260431e330558b90cd0.zip
frameworks_base-71a3d40d20c9507efab94260431e330558b90cd0.tar.gz
frameworks_base-71a3d40d20c9507efab94260431e330558b90cd0.tar.bz2
am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit 'e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00': bootanimation: build 32-bit if 64-bit gl libraries are not available
Diffstat (limited to 'cmds')
-rw-r--r--cmds/bootanimation/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index d5ff84e..dd987e0 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -24,5 +24,8 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= bootanimation
+ifdef TARGET_32_BIT_SURFACEFLINGER
+LOCAL_32_BIT_ONLY := true
+endif
include $(BUILD_EXECUTABLE)