diff options
| author | Stephen Hines <srhines@google.com> | 2015-10-21 00:21:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-21 00:21:58 +0000 |
| commit | 8e21026512fa5355878ee53004de38d7ab5e1532 (patch) | |
| tree | 7081f8a6cb1b85f273f347b9409164da26cfe468 | |
| parent | 63cd84ce33a6f2977558fb8a5fc598e35f93cd4f (diff) | |
| parent | 45b18f7a21b495cf35ad5bc0d802bd888d216302 (diff) | |
| download | compiler-rt-8e21026512fa5355878ee53004de38d7ab5e1532.tar.gz | |
Merge "Use prebuilts for sanitizer shared objects."
am: 45b18f7a21
* commit '45b18f7a21b495cf35ad5bc0d802bd888d216302':
Use prebuilts for sanitizer shared objects.
| -rw-r--r-- | lib/asan/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk index ff731e399..c274bd615 100644 --- a/lib/asan/Android.mk +++ b/lib/asan/Android.mk @@ -178,12 +178,14 @@ include $(BUILD_SHARED_LIBRARY) endef +ifeq (true,$(FORCE_BUILD_SANITIZER_SHARED_OBJECTS)) ifdef 2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY $(eval $(call build-asan-rt-shared-library,$(ADDRESS_SANITIZER_RUNTIME_LIBRARY),64)) $(eval $(call build-asan-rt-shared-library,$(2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY),32)) else $(eval $(call build-asan-rt-shared-library,$(ADDRESS_SANITIZER_RUNTIME_LIBRARY),32)) endif +endif include $(CLEAR_VARS) |