diff options
| author | Miao Wang <miaowang@google.com> | 2015-06-24 15:27:31 -0700 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2015-06-24 17:03:24 -0700 |
| commit | 8c10afdc806cbb9d4560e90b100f0dcefdd46a21 (patch) | |
| tree | 5f9f73ef7f9d38daf5fdc6beb0e86264df6c66e3 | |
| parent | 8886302a09fbc3be1e53cbd6d2a6e0c4225f0a12 (diff) | |
| download | mclinker-marshmallow-dev.tar.gz | |
make mclinker able to link arm object on x86 (fugu)android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
bug:21806530
Change-Id: If3fc7d8947216b43dad04556222f6635e7353991
| -rw-r--r-- | mcld-device-build.mk | 5 | ||||
| -rw-r--r-- | tools/mcld/Android.mk | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mcld-device-build.mk b/mcld-device-build.mk index 4c73156..5734e91 100644 --- a/mcld-device-build.mk +++ b/mcld-device-build.mk @@ -27,6 +27,11 @@ ifeq ($(HOST_OS),darwin) LOCAL_CFLAGS += -DDARWIN_FLEX=1 endif +ifeq ($(BUILD_ARM_FOR_X86),true) +LOCAL_CFLAGS_x86 += -DPROVIDE_ARM_CODEGEN -DFORCE_BUILD_ARM +LOCAL_CFLAGS_x86_64 += -DPROVIDE_ARM_CODEGEN -DFORCE_BUILD_ARM +endif + # Make sure bionic is first so we can include system headers. LOCAL_C_INCLUDES := \ bionic \ diff --git a/tools/mcld/Android.mk b/tools/mcld/Android.mk index a9e3dc6..0405848 100644 --- a/tools/mcld/Android.mk +++ b/tools/mcld/Android.mk @@ -60,6 +60,10 @@ endif # Add x86 libraries for both x86 and x86_64 targets ifneq (, $(findstring x86,$(TARGET_ARCH))) LOCAL_WHOLE_STATIC_LIBRARIES += $(MCLD_X86_LIBS) +ifeq ($(BUILD_ARM_FOR_X86),true) + LOCAL_WHOLE_STATIC_LIBRARIES += $(MCLD_ARM_LIBS) \ + $(MCLD_AARCH64_LIBS) +endif endif |