Remove extractor-defaults_no-sanitizer
bug: 147759770
test: build
Change-Id: I1afce18b449d7d2b137134975f67b719191b4a60
diff --git a/media/extractors/Android.bp b/media/extractors/Android.bp
index 06ef788..bb42580 100644
--- a/media/extractors/Android.bp
+++ b/media/extractors/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
cc_defaults {
- name: "extractor-defaults_no-sanitizer",
+ name: "extractor-defaults",
include_dirs: [
"frameworks/av/media/libstagefright/include",
@@ -35,12 +35,6 @@
],
version_script: "exports.lds",
-}
-
-cc_defaults {
- name: "extractor-defaults",
-
- defaults: ["extractor-defaults_no-sanitizer"],
sanitize: {
cfi: true,
diff --git a/media/extractors/mp4/Android.bp b/media/extractors/mp4/Android.bp
index 3dc3fed..e48e1b7 100644
--- a/media/extractors/mp4/Android.bp
+++ b/media/extractors/mp4/Android.bp
@@ -1,6 +1,6 @@
-cc_defaults {
- name: "libmp4extractor_defaults",
- defaults: ["extractor-defaults_no-sanitizer"],
+cc_library {
+ name: "libmp4extractor",
+ defaults: ["extractor-defaults"],
srcs: [
"AC4Parser.cpp",
@@ -17,24 +17,3 @@
"libutils",
],
}
-
-cc_library {
-
- name: "libmp4extractor",
- defaults: ["libmp4extractor_defaults"],
-
- sanitize: {
- cfi: true,
- misc_undefined: [
- "unsigned-integer-overflow",
- "signed-integer-overflow",
- ],
- },
-
-}
-
-cc_library_static {
- name: "libmp4extractor_fuzzing",
-
- defaults: ["libmp4extractor_defaults"],
-}