Snap for 6145313 from dfdf2035971a71516392f509e0678387e7c89db3 to rvc-release (3425d1ab) · 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"],
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		<hal>
		<name>android.hardware.media.c2</name>
		<transport>hwbinder</transport>
		<version>1.0</version>
		<version>1.1</version>
		<interface>
		<name>IComponentStore</name>
		<instance>software</instance>

+6 −0

Original line number	Diff line number	Diff line
		@@ -200,6 +200,7 @@ struct GlobalConfigTraits
		{
		static constexpr const char *speakerDrcEnabled = "speaker_drc_enabled";
		static constexpr const char *callScreenModeSupported= "call_screen_mode_supported";
		static constexpr const char *engineLibrarySuffix = "engine_library";
		};

		static status_t deserialize(const xmlNode root, AudioPolicyConfig config);
		@@ -692,6 +693,11 @@ status_t GlobalConfigTraits::deserialize(const xmlNode *root, AudioPolicyConfig
		convertTo<std::string, bool>(attr, value)) {
		config->setCallScreenModeSupported(value);
		}
		std::string engineLibrarySuffix = getXmlAttribute(cur, Attributes::engineLibrarySuffix);
		if (!engineLibrarySuffix.empty()) {
		config->setEngineLibraryNameSuffix(engineLibrarySuffix);
		}
		return NO_ERROR;
		}
		}
		return NO_ERROR;

+4 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,10 @@ filegroup {
		name: "audio_policy_configuration_generic",
		srcs: ["audio_policy_configuration_generic.xml"],
		}
		filegroup {
		name: "audio_policy_configuration_generic_configurable",
		srcs: ["audio_policy_configuration_generic_configurable.xml"],
		}
		filegroup {
		name: "usb_audio_policy_configuration",
		srcs: ["usb_audio_policy_configuration.xml"],