diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2018-05-29 18:13:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-29 18:13:23 -0700 |
| commit | dc737ff85f32510749ba507e289f59dec39b4a63 (patch) | |
| tree | b1452dd6dfc9a9d158b2f6f8f162fc0861d20fa3 | |
| parent | 5f655dd19aa7e96812f6a8dfdb060a8619195e9f (diff) | |
| parent | 1f59e369f3901a26af0d0f69317d92230030194a (diff) | |
| download | compiler-rt-oreo-mr1-1.2-iot-release.tar.gz | |
Merge "Remove dead module definitions" am: 67e0c02521android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
am: 1f59e369f3
Change-Id: I68668e7d01d32039a25c065face5b5c01e014150
| -rw-r--r-- | lib/asan/Android.bp | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/lib/asan/Android.bp b/lib/asan/Android.bp index 8fe61c2eb..ab1410494 100644 --- a/lib/asan/Android.bp +++ b/lib/asan/Android.bp @@ -116,97 +116,6 @@ cc_library_host_static { }, } -cc_defaults { - name: "libclang_rt_defaults", - - // TODO: - // This library must go on /system partition, even in SANITIZE_TARGET mode (when all libraries are - // installed on /data). That's because /data may not be available until vold does some magic and - // vold itself depends on this library. - - arch: { - arm: { - instruction_set: "arm", - }, - }, - include_dirs: [ - "external/compiler-rt/lib", - "external/compiler-rt/include", - ], - cflags: asan_rtl_cflags, - ldflags: ["-Wl,-z,global"], - srcs: asan_rtl_files + asan_rtl_cxx_files, - static_libs: [ - "libinterception", - "liblsan", - "libsan", - "libubsan", - ], - shared_libs: [ - "liblog", - "libdl", - ], - sanitize: { - never: true, - }, - sdk_version: "19", - stl: "none", - enabled: false, -} - -// Disable libclang_rt prebuilts in aosp/master until soong has a build option -// to pick a prebuilt or compile/build a module. -// -// cc_library_shared { -// name: "libclang_rt.asan-arm-android", -// defaults: ["libclang_rt_defaults"], -// arch: { -// arm: { -// enabled: true, -// }, -// }, -// } -// -// cc_library_shared { -// name: "libclang_rt.asan-aarch64-android", -// defaults: ["libclang_rt_defaults"], -// arch: { -// arm64: { -// enabled: true, -// }, -// }, -// } -// -// cc_library_shared { -// name: "libclang_rt.asan-mips-android", -// defaults: ["libclang_rt_defaults"], -// arch: { -// mips: { -// enabled: true, -// }, -// }, -// } -// -// cc_library_shared { -// name: "libclang_rt.asan-mips64-android", -// defaults: ["libclang_rt_defaults"], -// arch: { -// mips64: { -// enabled: true, -// }, -// }, -// } -// -// cc_library_shared { -// name: "libclang_rt.asan-i686-android", -// defaults: ["libclang_rt_defaults"], -// arch: { -// x86: { -// enabled: true, -// }, -// }, -// } - cc_binary { name: "asanwrapper", defaults: ["asan_arch_defaults"], |