diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-06-17 21:36:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-17 21:36:02 +0000 |
| commit | 5ddeb576ce582b81842a97d836f6a28cd419f7b3 (patch) | |
| tree | 55297480190248dfb280c8391d06147f50e45213 | |
| parent | 3e712fb7c5c51c1ee95f238ece72c04cfcb46212 (diff) | |
| parent | 893257d6c86a18cc5cf6c92528b7027f327dca70 (diff) | |
| download | valgrind-5ddeb576ce582b81842a97d836f6a28cd419f7b3.tar.gz | |
am 893257d6: Merge "Fix multilib value for vex-tests"android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-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-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-preview
* commit '893257d6c86a18cc5cf6c92528b7027f327dca70':
Fix multilib value for vex-tests
| -rw-r--r-- | main/Android.test.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/Android.test.mk b/main/Android.test.mk index a77530949..77ebbd0e0 100644 --- a/main/Android.test.mk +++ b/main/Android.test.mk @@ -1,6 +1,7 @@ include $(CLEAR_VARS) -LOCAL_MODULE=vg-$(test) -LOCAL_SRC_FILES=none/tests/$(TARGET_ARCH)/$(test).c +LOCAL_MULTILIB := first +LOCAL_MODULE := vg-$(test) +LOCAL_SRC_FILES := none/tests/$(TARGET_ARCH)/$(test).c include $(BUILD_NATIVE_TEST) |