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

Commit b73a1154 authored Jan 29, 2021 by Treehugger Robot Committed by Automerger Merge Worker Jan 29, 2021

Merge "more complete 64bit mediaserver build targets" am: 14dcc28c am: 1f3c103d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49e19a3c7439f296e9cbb8e9a4da4c75585fe738

parents 524f3121 1f3c103d

media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ cc_test {
		"libmediandk",
		],

		compile_multilib: "32",
		compile_multilib: "prefer32",

		cflags: [
		"-Werror",

media/libstagefright/tests/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ cc_test {
		"frameworks/native/include/media/openmax",
		],

		compile_multilib: "32",
		compile_multilib: "prefer32",

		cflags: [
		"-Werror",