Merge "Install extractors for 1st and 2nd ABIs to the test APEX" into qt-dev (ab09f6e6) · Commits · e / os / android_frameworks_av

apex/Android.bp

+19 −18

Original line number	Diff line number	Diff line
		@@ -12,14 +12,7 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		apex_defaults {
		name: "com.android.media-defaults",
		java_libs: ["updatable-media"],
		multilib: {
		first: {
		// Extractor process runs only with the primary ABI.
		native_shared_libs: [
		// Extractor plugins
		com_android_media_extractors = [
		"libaacextractor",
		"libamrextractor",
		"libflacextractor",
		@@ -30,9 +23,11 @@ apex_defaults {
		"libmpeg2extractor",
		"liboggextractor",
		"libwavextractor",
		],
		},
		},
		]

		apex_defaults {
		name: "com.android.media-defaults",
		java_libs: ["updatable-media"],
		key: "com.android.media.key",
		certificate: ":com.android.media.certificate",

		@@ -44,6 +39,12 @@ apex {
		name: "com.android.media",
		manifest: "manifest.json",
		defaults: ["com.android.media-defaults"],
		multilib: {
		first: {
		// Extractor process runs only with the primary ABI.
		native_shared_libs: com_android_media_extractors,
		},
		},
		}

		filegroup {

+7 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,13 @@ apex {
		manifest: "test_manifest.json",
		file_contexts: "com.android.media",
		defaults: ["com.android.media-defaults"],
		multilib: {
		both: {
		// for test apex, built for both ABIs
		native_shared_libs: com_android_media_extractors,
		},
		},
		compile_multilib: "both",
		installable: false,
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ cc_library_shared {
		name: "libaacextractor",
		relative_install_path: "extractors",

		compile_multilib: "first",
		compile_multilib: "both",

		cflags: [
		"-Werror",

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ cc_library_shared {
		name: "libamrextractor",
		relative_install_path: "extractors",

		compile_multilib: "first",
		compile_multilib: "both",

		cflags: [
		"-Werror",

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ cc_library_shared {
		name: "libflacextractor",
		relative_install_path: "extractors",

		compile_multilib: "first",
		compile_multilib: "both",

		cflags: [
		"-Werror",