Merge "Remove extractor-defaults_no-sanitizer" (8bf84ab6) · Commits · e / os / android_frameworks_av

media/extractors/Android.bp

+1 −7

Original line number	Diff line number	Diff line
		@@ -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 @@ cc_defaults {
		],

		version_script: "exports.lds",
		}

		cc_defaults {
		name: "extractor-defaults",

		defaults: ["extractor-defaults_no-sanitizer"],

		sanitize: {
		cfi: true,

+3 −24

Original line number	Diff line number	Diff line
		cc_defaults {
		name: "libmp4extractor_defaults",
		defaults: ["extractor-defaults_no-sanitizer"],
		cc_library {
		name: "libmp4extractor",
		defaults: ["extractor-defaults"],

		srcs: [
		"AC4Parser.cpp",
		@@ -17,24 +17,3 @@ cc_defaults {
		"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"],
		}