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 /seti/sltsEngine/Android.mk | |
| parent | 02ee88da2b803c3b9acd4980fa72f7a30187c247 (diff) | |
| parent | 540e7ee8dbf1d7ee72ef45c92efbebcb89bf6d1a (diff) | |
| download | srec-lollipop-mr1-dev.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.
Diffstat (limited to 'seti/sltsEngine/Android.mk')
| -rw-r--r-- | seti/sltsEngine/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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) |