diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-01 17:27:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 17:27:31 +0000 |
| commit | b451069aab57ccfe64c0fc7a18cfc487862fe985 (patch) | |
| tree | e4bfac752d9937dbce9f0cb9d0ad1c748c23afb9 | |
| parent | cd33037f559514efe6b51ea1334017ab5a40992f (diff) | |
| parent | 62a7c02e0efaaf002dcd8864be91a65a0d899e5f (diff) | |
| download | libcxxabi-marshmallow-mr2-release.tar.gz | |
am 62a7c02e: Don\'t bundle the unwinder.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_r1afw-test-harness-1.5marshmallow-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-releaselinaro-android-6.0
* commit '62a7c02e0efaaf002dcd8864be91a65a0d899e5f':
Don't bundle the unwinder.
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -85,12 +85,6 @@ LOCAL_CPPFLAGS_x86 := -DLIBCXXABI_USE_LLVM_UNWINDER=0 LOCAL_CPPFLAGS_x86_64 := -DLIBCXXABI_USE_LLVM_UNWINDER=0 LOCAL_CXX_STL := none LOCAL_RTTI_FLAG := $(LIBCXXABI_RTTI_FLAG) -LOCAL_WHOLE_STATIC_LIBRARIES_arm := libunwind_llvm -LOCAL_WHOLE_STATIC_LIBRARIES_arm64 := libunwindbacktrace -LOCAL_WHOLE_STATIC_LIBRARIES_mips := libunwindbacktrace -LOCAL_WHOLE_STATIC_LIBRARIES_mips64 := libunwindbacktrace -LOCAL_WHOLE_STATIC_LIBRARIES_x86 := libunwindbacktrace -LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 := libunwindbacktrace LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk # src/Unwind/UnwindRegistersSave.S does not compile. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as |