diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-23 09:38:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-23 09:38:45 +0000 |
| commit | 3279a68c2735ac1e1265ab2ecf5ee9c9afa076b3 (patch) | |
| tree | 5ab6b99eb13340d9d8e98c6e9b5ce1636a32a94c | |
| parent | 32015a3c4923dac0dc59c4ce17a1b0944809c128 (diff) | |
| parent | 1623a6176e7d68762fe4b3312a4a1de8042292db (diff) | |
| download | svox-3279a68c2735ac1e1265ab2ecf5ee9c9afa076b3.tar.gz | |
Merge "force 32-bit build to fix garbled output" am: b2d04a95a8 am: bf6d92d8d8android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4
am: 1623a6176e
Change-Id: Iee460accb1f4d9a521bd56b0ab6462c37419c7ff
| -rwxr-xr-x | pico/Android.mk | 1 | ||||
| -rwxr-xr-x | pico/compat/jni/Android.mk | 1 | ||||
| -rw-r--r-- | pico/lib/Android.mk | 1 | ||||
| -rw-r--r-- | pico/tts/Android.mk | 2 |
4 files changed, 5 insertions, 0 deletions
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 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := PicoTts +LOCAL_MULTILIB := 32 LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ 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 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE:= libttscompat +LOCAL_MULTILIB := 32 LOCAL_SRC_FILES:= \ com_android_tts_compat_SynthProxy.cpp 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 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libsvoxpico +LOCAL_MULTILIB := 32 LOCAL_SRC_FILES := \ picoacph.c \ 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 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libttspico_engine +LOCAL_MULTILIB := 32 LOCAL_SRC_FILES := \ com_svox_picottsengine.cpp \ @@ -36,6 +37,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libttspico +LOCAL_MULTILIB := 32 LOCAL_SRC_FILES := \ com_svox_picottsengine.cpp \ |