commit caad6c126ff53eb9c0fd077f6a80e8456a7181fd
author Dan Willemsen <dwillemsen@google.com> Wed Aug 17 01:43:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 17 01:43:58 2016 +0000
tree 97d2746c8b0255f1661a69ef517a23e35f2fbe7d
parent 31e24e118fb861a43121dcb0efd1f88606423206
parent 319fd422c02a8012930019560d1bd913188c86b0

Merge "Mark default.supp as ETC instead of SHARED_LIBRARY" am: 24905f154e
am: 319fd422c0

Change-Id: I565f8e3cde5e1810c9d678772564c9e7897e7082

Android.mk

diff --git a/Android.mk b/Android.mk
index f105db4..6117e3e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -613,9 +613,8 @@
 # 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 @@
 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)