Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 624e6b8f authored Dec 07, 2020 by Max Spector Committed by Automerger Merge Worker Dec 07, 2020

Merge "Codec2 components: Updated to build both static and shared libray" am:...

Merge "Codec2 components: Updated to build both static and shared libray" am: 8fb2e4ad am: 045116b1 am: 5a7f8209

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1506813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47d251c6d4b607fe1f372beb59676caab41f94b4

parents 6d2fcc17 5a7f8209

media/codec2/components/aac/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_aacdec",
		defaults: [
		"libcodec2_soft-defaults",
		@@ -15,7 +15,7 @@ cc_library_shared {
		],
		}

		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_aacenc",
		defaults: [
		"libcodec2_soft-defaults",

media/codec2/components/amr_nb_wb/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_amrnbdec",
		defaults: [
		"libcodec2_soft-defaults",
		@@ -21,7 +21,7 @@ cc_library_shared {
		],
		}

		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_amrwbdec",
		defaults: [
		"libcodec2_soft-defaults",
		@@ -40,7 +40,7 @@ cc_library_shared {
		],
		}

		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_amrnbenc",
		defaults: [
		"libcodec2_soft-defaults",
		@@ -58,7 +58,7 @@ cc_library_shared {
		],
		}

		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_amrwbenc",
		defaults: [
		"libcodec2_soft-defaults",

media/codec2/components/aom/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_av1dec_aom",
		defaults: [
		"libcodec2_soft-defaults",

media/codec2/components/avc/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_avcdec",
		defaults: [
		"libcodec2_soft-defaults",
		@@ -15,7 +15,7 @@ cc_library_shared {
		],
		}

		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_avcenc",
		defaults: [
		"libcodec2_soft-defaults",

media/codec2/components/base/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		// DO NOT DEPEND ON THIS DIRECTLY
		// use libcodec2_soft-defaults instead
		cc_library_shared {
		cc_library {
		name: "libcodec2_soft_common",
		defaults: ["libcodec2-impl-defaults"],
		vendor_available: true,
		@@ -96,7 +96,7 @@ cc_defaults {
		}

		// TEMP: used by cheets2 project - remove when no longer used
		cc_library_shared {
		cc_library {
		name: "libcodec2_simple_component",
		vendor_available: true,