aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGoran Jakovljevic <Goran.Jakovljevic@imgtec.com>2017-02-21 20:39:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-21 20:39:54 +0000
commit5270d443a29a8e82fcc697bb13aa08328dce913c (patch)
tree8c7fc925953910c5d705d1b21c8c91f4cfb41e6c
parent8d45ecaf5d34cfabbe53ebb22dffaa6a56cf74e2 (diff)
parent308b9f770e9db0cb1e36b66c9f509e24924a56cf (diff)
downloadstrace-oreo-r6-release.tar.gz
Merge "Revert "Disable broken mips strace build."" am: d5bce2f27b am: 304752e0d4android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
am: 308b9f770e Change-Id: I1695d490f89584cb0c554713dc865f4b5dcca031
-rw-r--r--Android.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 616bc6ea..a372697e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,8 +37,6 @@ LOCAL_PATH := $(call my-dir)
# -------------------------------------------------------------------------
-ifneq ($(strip $(TARGET_ARCH)),mips)
-
include $(CLEAR_VARS)
strace_version := $(shell grep strace $(LOCAL_PATH)/debian/changelog | \
@@ -351,5 +349,3 @@ LOCAL_MODULE_TAGS := debug
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_EXECUTABLE)
-
-endif