Merge changes Iaad01f6f,I47b06002 into main (ba71bc94) · Commits · e / os / android_frameworks_base

core/java/android/app/Instrumentation.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ public class Instrumentation {
		* @param arguments Any additional arguments that were supplied when the
		* instrumentation was started.
		*/
		@android.ravenwood.annotation.RavenwoodKeep
		public void onCreate(Bundle arguments) {
		}

libs/hwui/Android.bp

+11 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,9 @@ java_sdk_library {
		visibility: [
		"//frameworks/base", // Framework
		],
		impl_library_visibility: [
		"//frameworks/base/ravenwood",
		],

		srcs: [
		":framework-graphics-srcs",
		@@ -226,6 +229,14 @@ java_sdk_library {
		unsafe_ignore_missing_latest_api: true,
		}

		filegroup {
		name: "framework-graphics-ravenwood-policies",
		srcs: [
		"framework-graphics-ravenwood-policies.txt",
		],
		visibility: ["//frameworks/base/ravenwood"],
		}

		filegroup {
		name: "framework-graphics-srcs",
		srcs: [

libs/hwui/framework-graphics-ravenwood-policies.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		class android.graphics.ColorMatrix keepclass

ravenwood/Android.bp

+13 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,7 @@ java_library {
		name: "ravenwood-helper-framework-runtime",
		srcs: [
		"runtime-helper-src/framework/*/.java",
		":framework-graphics-srcs",
		],
		static_libs: [
		"ravenwood-runtime-common",
		@@ -278,6 +279,7 @@ cc_library_host_shared {
		cc_library_host_shared {
		name: "libravenwood_runtime",
		defaults: ["ravenwood_jni_defaults"],
		header_libs: ["libicuuc_headers"],
		srcs: [
		"runtime-jni/ravenwood_runtime.cpp",
		"runtime-jni/ravenwood_os_constants.cpp",
		@@ -372,6 +374,13 @@ platform_compat_config {
		visibility: ["//visibility:private"],
		}

		java_library {
		name: "ext-ravenwood",
		installable: false,
		static_libs: ["ext"],
		visibility: ["//visibility:private"],
		}

		filegroup {
		name: "ravenwood-data",
		device_common_srcs: [
		@@ -637,6 +646,7 @@ android_ravenwood_libgroup {
		libs: [
		"100-framework-minus-apex.ravenwood",
		"200-kxml2-android",
		"ext-ravenwood",

		"ravenwood-runtime-common-ravenwood",

		@@ -661,6 +671,9 @@ android_ravenwood_libgroup {
		// StatsD
		"framework-statsd.ravenwood",

		// Graphics
		"framework-graphics.ravenwood",

		// Provide runtime versions of utils linked in below
		"junit",
		"truth",

ravenwood/Framework.bp

+54 −0

Original line number	Diff line number	Diff line
		@@ -399,3 +399,57 @@ java_genrule {
		"framework-statsd.ravenwood.jar",
		],
		}

		//////////////////////
		// framework-graphics
		//////////////////////

		java_genrule {
		name: "framework-graphics.ravenwood-base",
		tools: ["hoststubgen"],
		cmd: "$(location hoststubgen) " +
		"@$(location :ravenwood-standard-options) " +

		"--debug-log $(location framework-graphics.log) " +
		"--stats-file $(location framework-graphics_stats.csv) " +
		"--supported-api-list-file $(location framework-graphics_apis.csv) " +
		"--gen-keep-all-file $(location framework-graphics_keep_all.txt) " +
		"--gen-input-dump-file $(location framework-graphics_dump.txt) " +

		"--out-impl-jar $(location ravenwood.jar) " +
		"--in-jar $(location :framework-graphics.impl{.jar}) " +

		"--policy-override-file $(location :ravenwood-common-policies) " +
		"--policy-override-file $(location :framework-graphics-ravenwood-policies) ",
		srcs: [
		":framework-graphics.impl{.jar}",

		":ravenwood-common-policies",
		":framework-graphics-ravenwood-policies",
		":ravenwood-standard-options",
		],
		out: [
		"ravenwood.jar",

		// Following files are created just as FYI.
		"framework-graphics_keep_all.txt",
		"framework-graphics_dump.txt",

		"framework-graphics.log",
		"framework-graphics_stats.csv",
		"framework-graphics_apis.csv",
		],
		visibility: ["//visibility:private"],
		}

		java_genrule {
		name: "framework-graphics.ravenwood",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":framework-graphics.ravenwood-base{ravenwood.jar}",
		],
		out: [
		"framework-graphics.ravenwood.jar",
		],
		}