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

Commit 419f137b 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

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

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

parents 0ccd103a 71db43c5

media/native/midi/Android.bp

+4 −0

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

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

	}		}

native/android/Android.bp

+3 −0

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

	cc_defaults {		cc_defaults {