commit 6d2d4a29a7aa2b38eda7c26ed45c7bfcb06da77a
author The Android Automerger <android-build@google.com> Thu Mar 03 00:01:00 2016 -0800
committer The Android Automerger <android-build@google.com> Thu Mar 03 00:01:00 2016 -0800
tree 7aaf60aecdbdc735345adc5ce3b27dfb1d97d646
parent 45ca9a6b9c394f2edf37526f562eeaf655299fc8
parent 3cd0a7e16e032e339fedef73de4830bb74df4457

merge in nyc-release history after reset to nyc-dev

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 555db44..854314d 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -77,7 +77,8 @@
         utils/thread.c \
         utils/utils.c
 
-LOCAL_CFLAGS := -DANDROID -DWEBP_SWAP_16BIT_CSP
+LOCAL_ARM_MODE := arm
+LOCAL_CFLAGS := -O2 -DANDROID -DWEBP_SWAP_16BIT_CSP
 
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/enc \
@@ -147,7 +148,8 @@
         utils/thread.c \
         utils/utils.c
 
-LOCAL_CFLAGS := -DANDROID -DWEBP_SWAP_16BIT_CSP
+LOCAL_ARM_MODE := arm
+LOCAL_CFLAGS := -O2 -DANDROID -DWEBP_SWAP_16BIT_CSP
 
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/dec \