diff options
| author | Tim Murray <timmurray@google.com> | 2014-08-18 13:48:58 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-08-18 13:48:58 -0700 |
| commit | 20f6b4bde1e6b6c7518a1ad23e07a44027ba1a88 (patch) | |
| tree | 4493b7b40917aa58436318b062ef51c7405996f0 | |
| parent | b0ae117f65375dfc05ddbc7ba0ecdbd0292e7ea0 (diff) | |
| download | linux-tools-perf-20f6b4bde1e6b6c7518a1ad23e07a44027ba1a88.tar.gz | |
DO NOT MERGEandroid-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
Fix build break for lmp-dev-gpl.
Change-Id: Ifdc6824e2e4ac62b9e287eaa87682b88cef22c6a
| -rw-r--r-- | perf-3.12.0/tools/perf/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/perf-3.12.0/tools/perf/Android.mk b/perf-3.12.0/tools/perf/Android.mk index f5d6886..092f380 100644 --- a/perf-3.12.0/tools/perf/Android.mk +++ b/perf-3.12.0/tools/perf/Android.mk @@ -214,6 +214,8 @@ LOCAL_MODULE := libperf LOCAL_MODULE_TAGS := eng LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_CLANG := false + include $(BUILD_HOST_STATIC_LIBRARY) # @@ -287,6 +289,8 @@ LOCAL_MODULE := perfhost LOCAL_MODULE_TAGS := eng LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_CLANG := false + include $(BUILD_HOST_EXECUTABLE) endif #cur_platform |