commit bf6d92d8d874241dfb482e19d2944ad6b9a226b6
author Narayan Kamath <narayan@google.com> Wed Nov 23 09:32:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 23 09:32:45 2016 +0000
tree 5ab6b99eb13340d9d8e98c6e9b5ce1636a32a94c
parent 0c1c942de3b742aa02a83cb4cffd464d5a953825
parent b2d04a95a8d7f5edeb4fe4d7b2febbd7b5b265c2

Merge "force 32-bit build to fix garbled output"
am: b2d04a95a8

Change-Id: I3a50d0639d9638c938551401d2e619f25cceb164

pico/Android.mk

diff --git a/pico/Android.mk b/pico/Android.mk
index 2f6420e..e35e6be 100755
--- a/pico/Android.mk
+++ b/pico/Android.mk
@@ -8,6 +8,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_PACKAGE_NAME := PicoTts
+LOCAL_MULTILIB := 32
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \

pico/compat/jni/Android.mk

diff --git a/pico/compat/jni/Android.mk b/pico/compat/jni/Android.mk
index 5a7180c..9b3ad60 100755
--- a/pico/compat/jni/Android.mk
+++ b/pico/compat/jni/Android.mk
@@ -2,6 +2,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE:= libttscompat
+LOCAL_MULTILIB := 32
 
 LOCAL_SRC_FILES:= \
 	com_android_tts_compat_SynthProxy.cpp

pico/lib/Android.mk

diff --git a/pico/lib/Android.mk b/pico/lib/Android.mk
index 70f0099..cdf0026 100644
--- a/pico/lib/Android.mk
+++ b/pico/lib/Android.mk
@@ -4,6 +4,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libsvoxpico
+LOCAL_MULTILIB := 32
 
 LOCAL_SRC_FILES := \
 	picoacph.c \

pico/tts/Android.mk

diff --git a/pico/tts/Android.mk b/pico/tts/Android.mk
index 335a1c2..0f0d737 100644
--- a/pico/tts/Android.mk
+++ b/pico/tts/Android.mk
@@ -7,6 +7,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libttspico_engine
+LOCAL_MULTILIB := 32
 
 LOCAL_SRC_FILES := \
 	com_svox_picottsengine.cpp \
@@ -36,6 +37,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libttspico
+LOCAL_MULTILIB := 32
 	
 LOCAL_SRC_FILES := \
 	com_svox_picottsengine.cpp \