summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-03-20 17:47:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-20 17:47:10 +0000
commit4a1bc7dfc1fc13c29e30353e488bd12ee91836cb (patch)
tree05f416d9d7563115e3a2a12457e2f3ee89a92682
parent1f839d92100c5f05cbd52b8f5d0671d984a48334 (diff)
parente4360c8e14d1ea362fb1d13b7a5c9bf003f3be00 (diff)
downloadframeworks_base-4a1bc7dfc1fc13c29e30353e488bd12ee91836cb.zip
frameworks_base-4a1bc7dfc1fc13c29e30353e488bd12ee91836cb.tar.gz
frameworks_base-4a1bc7dfc1fc13c29e30353e488bd12ee91836cb.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
-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)