diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-02 18:30:40 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-02 18:30:40 +0000 |
| commit | 10aec4f35c2716356dd8ab153705b8165d3a01a7 (patch) | |
| tree | 1487bb77cf6d7bba53474fb58434fb54e2567dc4 | |
| parent | f22c9e46425c48d6f3c7e0d7873b54ddafcab9b4 (diff) | |
| parent | 60d0bea5ed7f36d788432da826d28127dfd723f3 (diff) | |
| download | libunwind-oreo-dr2-release.tar.gz | |
release-request-e44ed829-e254-4762-ae37-a7739a0f37fb-for-git_oc-dr1-release-3964285 snap-temp-L49200000059745790android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release
Change-Id: I867b4f07994ce5d22b5496b100896787df7e0896
| -rw-r--r-- | Android.bp | 38 |
1 files changed, 30 insertions, 8 deletions
@@ -38,24 +38,47 @@ cc_defaults { "-DNDEBUG", ], + // libunwind expects to find include/libunwind_i.h before + // include/tdep-<arch>/libunwind_i.h, but soong prepends arch-specific + // include directories. To keep the include directories in the right + // order, pass "include" as an architecture specific include for every + // architecture. arch: { arm: { - local_include_dirs: ["include/tdep-arm"], + local_include_dirs: [ + "include", + "include/tdep-arm", + ], }, arm64: { - local_include_dirs: ["include/tdep-aarch64"], + local_include_dirs: [ + "include", + "include/tdep-aarch64", + ], }, mips: { - local_include_dirs: ["include/tdep-mips"], + local_include_dirs: [ + "include", + "include/tdep-mips", + ], }, mips64: { - local_include_dirs: ["include/tdep-mips"], + local_include_dirs: [ + "include", + "include/tdep-mips", + ], }, x86: { - local_include_dirs: ["include/tdep-x86"], + local_include_dirs: [ + "include", + "include/tdep-x86", + ], }, x86_64: { - local_include_dirs: ["include/tdep-x86_64"], + local_include_dirs: [ + "include", + "include/tdep-x86_64", + ], }, }, @@ -91,7 +114,6 @@ cc_defaults { local_include_dirs: [ "src", - "include", ], } @@ -172,7 +194,7 @@ cc_library { "src/ptrace/_UPT_get_proc_name.c", "src/ptrace/_UPT_reg_offset.c", "src/ptrace/_UPT_resume.c", - ], + ], arch: { arm: { |