aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-09 16:38:06 -0700
committerElliott Hughes <enh@google.com>2014-04-09 16:38:06 -0700
commit82ae18484c7b6a8af05354caf6de3a7f1ac5fcf9 (patch)
treeb57ad770a528d14dd062a1bf30c64e730ee4fe4c
parent161efa6f4e7ea6657918a2f1736a692eea2f56c0 (diff)
downloadltrace-82ae18484c7b6a8af05354caf6de3a7f1ac5fcf9.tar.gz
Build ltrace for x86 and x86-64.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
(Needs a bionic <sys/user.h> change.) Bug: 13889008 Change-Id: Id2d067af58eae01fb4b9ddaeef749ed79b8a9a37
-rw-r--r--Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 68a8c43..d93784e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -99,6 +99,10 @@ LOCAL_SRC_FILES_x86 := \
$(x86_path)/regs.c \
$(x86_path)/trace.c \
+# x86_64 uses the same source as x86.
+LOCAL_C_INCLUDES_x86_64 := $(LOCAL_C_INCLUDES_x86)
+LOCAL_SRC_FILES_x86_64 := $(LOCAL_SRC_FILES_x86)
+
LOCAL_CFLAGS := -D_GNU_SOURCE=1 -D_POSIX_SOURCE=1
LOCAL_CFLAGS += \
@@ -184,7 +188,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := debug
-LOCAL_MODULE_TARGET_ARCH := arm arm64
+LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk