diff options
author | Ian Rogers <irogers@google.com> | 2014-06-05 20:14:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 20:14:05 +0000 |
commit | fe5ffaffe727941fe1ea3581be2eab63d228e6c4 (patch) | |
tree | f79e6de865348ee168c725ee9904f1db0a6f21ca | |
parent | 02ee88da2b803c3b9acd4980fa72f7a30187c247 (diff) | |
parent | 540e7ee8dbf1d7ee72ef45c92efbebcb89bf6d1a (diff) | |
download | srec-fe5ffaffe727941fe1ea3581be2eab63d228e6c4.tar.gz |
am 540e7ee8: Merge "Build on host as 32-bit as there are 64-bit bugs in this code."android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
* commit '540e7ee8dbf1d7ee72ef45c92efbebcb89bf6d1a':
Build on host as 32-bit as there are 64-bit bugs in this code.
-rw-r--r-- | config/en.us/Android.mk | 1 | ||||
-rw-r--r-- | portable/Android.mk | 2 | ||||
-rw-r--r-- | seti/sltsEngine/Android.mk | 2 | ||||
-rw-r--r-- | shared/Android.mk | 2 | ||||
-rw-r--r-- | srec/AcousticModels/Android.mk | 2 | ||||
-rw-r--r-- | srec/AcousticState/Android.mk | 2 | ||||
-rw-r--r-- | srec/EventLog/Android.mk | 2 | ||||
-rw-r--r-- | srec/Grammar/Android.mk | 2 | ||||
-rw-r--r-- | srec/Nametag/Android.mk | 2 | ||||
-rw-r--r-- | srec/Recognizer/Android.mk | 2 | ||||
-rw-r--r-- | srec/Semproc/Android.mk | 2 | ||||
-rw-r--r-- | srec/Session/Android.mk | 2 | ||||
-rw-r--r-- | srec/Vocabulary/Android.mk | 2 | ||||
-rw-r--r-- | srec/ca/Android.mk | 2 | ||||
-rw-r--r-- | tools/dictTest/Android.mk | 2 | ||||
-rw-r--r-- | tools/grxmlcompile/Android.mk | 2 | ||||
-rw-r--r-- | tools/make_cfst/Android.mk | 2 | ||||
-rw-r--r-- | tools/make_g2g/Android.mk | 2 | ||||
-rw-r--r-- | tools/make_ve_grammar/Android.mk | 2 | ||||
-rw-r--r-- | tools/parseStringTest/Android.mk | 2 | ||||
-rw-r--r-- | tools/test_g2g/Android.mk | 2 | ||||
-rw-r--r-- | tools/test_swiarb/Android.mk | 2 | ||||
-rw-r--r-- | tools/thirdparty/OpenFst/fst/lib/Android.mk | 2 |
23 files changed, 45 insertions, 0 deletions
diff --git a/config/en.us/Android.mk b/config/en.us/Android.mk index 881c2ee..28aff32 100644 --- a/config/en.us/Android.mk +++ b/config/en.us/Android.mk @@ -105,5 +105,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := dictionary/cmu2nuance.cpp LOCAL_MODULE := cmu2nuance LOCAL_MODULE_TAGS := optional +LOCAL_32_BIT_ONLY := true include $(BUILD_HOST_EXECUTABLE) diff --git a/portable/Android.mk b/portable/Android.mk index 00376b2..3e69079 100644 --- a/portable/Android.mk +++ b/portable/Android.mk @@ -56,6 +56,8 @@ LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/seti/sltsEngine/Android.mk b/seti/sltsEngine/Android.mk index 64e6c4c..c28eb9f 100644 --- a/seti/sltsEngine/Android.mk +++ b/seti/sltsEngine/Android.mk @@ -42,6 +42,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/shared/Android.mk b/shared/Android.mk index 7af1cdc..5f94516 100644 --- a/shared/Android.mk +++ b/shared/Android.mk @@ -50,6 +50,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/AcousticModels/Android.mk b/srec/AcousticModels/Android.mk index ca605cf..542c2ff 100644 --- a/srec/AcousticModels/Android.mk +++ b/srec/AcousticModels/Android.mk @@ -53,6 +53,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/AcousticState/Android.mk b/srec/AcousticState/Android.mk index fc10bf3..ce23c38 100644 --- a/srec/AcousticState/Android.mk +++ b/srec/AcousticState/Android.mk @@ -52,6 +52,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/EventLog/Android.mk b/srec/EventLog/Android.mk index babdf6f..e244198 100644 --- a/srec/EventLog/Android.mk +++ b/srec/EventLog/Android.mk @@ -44,6 +44,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/Grammar/Android.mk b/srec/Grammar/Android.mk index b217e61..71a03f9 100644 --- a/srec/Grammar/Android.mk +++ b/srec/Grammar/Android.mk @@ -57,6 +57,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/Nametag/Android.mk b/srec/Nametag/Android.mk index 3ddbc54..81aac73 100644 --- a/srec/Nametag/Android.mk +++ b/srec/Nametag/Android.mk @@ -57,6 +57,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/Recognizer/Android.mk b/srec/Recognizer/Android.mk index 23247e9..1129f53 100644 --- a/srec/Recognizer/Android.mk +++ b/srec/Recognizer/Android.mk @@ -60,6 +60,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/Semproc/Android.mk b/srec/Semproc/Android.mk index ee99cde..d6928fb 100644 --- a/srec/Semproc/Android.mk +++ b/srec/Semproc/Android.mk @@ -60,6 +60,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/Session/Android.mk b/srec/Session/Android.mk index 635315d..1cdb726 100644 --- a/srec/Session/Android.mk +++ b/srec/Session/Android.mk @@ -54,6 +54,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/Vocabulary/Android.mk b/srec/Vocabulary/Android.mk index 5b3907c..7385cd6 100644 --- a/srec/Vocabulary/Android.mk +++ b/srec/Vocabulary/Android.mk @@ -54,6 +54,8 @@ LOCAL_SHARED_LIBRARIES := $(common_SHARED_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/srec/ca/Android.mk b/srec/ca/Android.mk index fbc6d22..38e3fd9 100644 --- a/srec/ca/Android.mk +++ b/srec/ca/Android.mk @@ -103,6 +103,8 @@ LOCAL_STATIC_LIBRARIES := $(common_STATIC_LIBRARIES) LOCAL_MODULE := $(common_TARGET) +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/tools/dictTest/Android.mk b/tools/dictTest/Android.mk index d99e4a7..5c97003 100644 --- a/tools/dictTest/Android.mk +++ b/tools/dictTest/Android.mk @@ -40,4 +40,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= dictTest +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/grxmlcompile/Android.mk b/tools/grxmlcompile/Android.mk index 82d931a..7e6d10e 100644 --- a/tools/grxmlcompile/Android.mk +++ b/tools/grxmlcompile/Android.mk @@ -80,6 +80,8 @@ LOCAL_LDLIBS := \ LOCAL_MODULE:= grxmlcompile +LOCAL_32_BIT_ONLY := true + include external/libcxx/libcxx.mk include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/make_cfst/Android.mk b/tools/make_cfst/Android.mk index 9c7cc5a..cede0a5 100644 --- a/tools/make_cfst/Android.mk +++ b/tools/make_cfst/Android.mk @@ -53,6 +53,8 @@ endif LOCAL_MODULE:= make_cfst +LOCAL_32_BIT_ONLY := true + include external/libcxx/libcxx.mk include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/make_g2g/Android.mk b/tools/make_g2g/Android.mk index 9c7ad83..2687395 100644 --- a/tools/make_g2g/Android.mk +++ b/tools/make_g2g/Android.mk @@ -42,4 +42,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= make_g2g +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/make_ve_grammar/Android.mk b/tools/make_ve_grammar/Android.mk index dd99239..ea063d5 100644 --- a/tools/make_ve_grammar/Android.mk +++ b/tools/make_ve_grammar/Android.mk @@ -38,4 +38,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= make_ve_grammar +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/parseStringTest/Android.mk b/tools/parseStringTest/Android.mk index 5f33459..740d60e 100644 --- a/tools/parseStringTest/Android.mk +++ b/tools/parseStringTest/Android.mk @@ -42,4 +42,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= parseStringTest +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/test_g2g/Android.mk b/tools/test_g2g/Android.mk index c4bdd17..594d2f1 100644 --- a/tools/test_g2g/Android.mk +++ b/tools/test_g2g/Android.mk @@ -43,4 +43,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test_g2g +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/test_swiarb/Android.mk b/tools/test_swiarb/Android.mk index a26219f..e021a70 100644 --- a/tools/test_swiarb/Android.mk +++ b/tools/test_swiarb/Android.mk @@ -38,4 +38,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test_swiarb +LOCAL_32_BIT_ONLY := true + include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/thirdparty/OpenFst/fst/lib/Android.mk b/tools/thirdparty/OpenFst/fst/lib/Android.mk index dfd3686..44f7855 100644 --- a/tools/thirdparty/OpenFst/fst/lib/Android.mk +++ b/tools/thirdparty/OpenFst/fst/lib/Android.mk @@ -26,6 +26,8 @@ LOCAL_LDLIBS += -lpthread LOCAL_MODULE := libfst +LOCAL_32_BIT_ONLY := true + include external/libcxx/libcxx.mk include $(BUILD_HOST_SHARED_LIBRARY) |