diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-08-17 01:03:41 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-17 01:03:42 +0000 |
commit | 24905f154e8ed939fe2e276052681aee1004d405 (patch) | |
tree | 97d2746c8b0255f1661a69ef517a23e35f2fbe7d | |
parent | 31e24e118fb861a43121dcb0efd1f88606423206 (diff) | |
parent | ed06fc8bc476abd0bb4279b855517fec6820f698 (diff) | |
download | valgrind-24905f154e8ed939fe2e276052681aee1004d405.tar.gz |
Merge "Mark default.supp as ETC instead of SHARED_LIBRARY"
-rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index f105db4dd..6117e3ea4 100644 --- a/Android.mk +++ b/Android.mk @@ -613,9 +613,8 @@ endif # Copy prebuilt suppressions include $(CLEAR_VARS) LOCAL_MODULE := default.supp -LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(PRODUCT_OUT)$(vg_target_module_path) -LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES := bionic.supp include $(BUILD_PREBUILT) @@ -624,9 +623,8 @@ ifeq ($(HOST_OS), linux) include $(CLEAR_VARS) LOCAL_IS_HOST_MODULE := true LOCAL_MODULE := default.supp -LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(HOST_OUT_SHARED_LIBRARIES)/valgrind -LOCAL_STRIP_MODULE := false LOCAL_SRC_FILES := bionic.supp include $(BUILD_PREBUILT) |