diff options
| author | Christopher Ferris <cferris@google.com> | 2014-06-11 02:42:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 22:08:45 +0000 |
| commit | fa3c26b862ca17c0d2db67606226b49d1648b4bf (patch) | |
| tree | c5dd0ddd010667427f861c39b684fcf3182eb30f | |
| parent | ab64e2aa4c8cd87e1a588018d57ede5533be0a23 (diff) | |
| parent | e8981d1a842397174f786c510ffd6482b3723e84 (diff) | |
| download | gtest-fa3c26b862ca17c0d2db67606226b49d1648b4bf.tar.gz | |
Merge "Add LOCAL_MULTILIB := both for host targets."studio_0.8.6gradle_0.13.3gradle_0.13.2gradle_0.13.1gradle_0.13.0gradle_0.12.2android-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_r1adt_23.0.3ub-tools-idea133-milestonelollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseidea133-milestoneidea133
| -rw-r--r-- | src/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Android.mk b/src/Android.mk index 5d2520a..65fa2b8 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -49,6 +49,7 @@ LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_host +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) @@ -62,6 +63,7 @@ LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_host +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) @@ -113,6 +115,7 @@ LOCAL_SRC_FILES := gtest-all.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_libc++_host +LOCAL_MULTILIB := both include external/libcxx/libcxx.mk include $(BUILD_HOST_STATIC_LIBRARY) @@ -128,6 +131,7 @@ LOCAL_SRC_FILES := gtest_main.cc LOCAL_C_INCLUDES := $(libgtest_host_includes) LOCAL_CFLAGS += $(libgtest_cflags) LOCAL_MODULE := libgtest_main_libc++_host +LOCAL_MULTILIB := both include external/libcxx/libcxx.mk include $(BUILD_HOST_STATIC_LIBRARY) |