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

Commit a74a1546 authored Sep 28, 2022 by Treehugger Robot Committed by Automerger Merge Worker Sep 28, 2022

Merge changes Ifd00d8d4,Id8db2858 am: eb3651fe am: a2ba909c am: 71db43c5...

Merge changes Ifd00d8d4,Id8db2858 am: eb3651fe am: a2ba909c am: 71db43c5 am: 419f137b am: 68099d35

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2212407

Change-Id: If0d77d1808f215970bd6bd63aad66794d482e16d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b802258d 68099d35

media/native/midi/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -74,4 +74,8 @@ ndk_library {
		symbol_file: "libamidi.map.txt",

		first_version: "29",
		export_header_libs: [
		"amidi",
		],

		}

native/android/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,9 @@ ndk_library {
		symbol_file: "libandroid.map.txt",
		first_version: "9",
		unversioned_until: "current",
		export_header_libs: [
		"libandroid_headers",
		],
		}

		cc_defaults {