Snap for 8414339 from 7c6e24e2a44ab8148fdcf32b5d61f048c14269f8 to tm-qpr1-release (c9f7c3f5) · Commits · e / os / android_frameworks_base

Android.bp

+3 −5

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@ filegroup {
		// Java/AIDL sources under frameworks/base
		":framework-annotations",
		":framework-blobstore-sources",
		":framework-connectivity-tiramisu-sources",
		":framework-core-sources",
		":framework-drm-sources",
		":framework-graphics-nonupdatable-sources",
		@@ -97,6 +96,7 @@ filegroup {
		":platform-compat-native-aidl",

		// AIDL sources from external directories
		":android.hardware.gnss-V2-java-source",
		":android.hardware.graphics.common-V3-java-source",
		":android.hardware.security.keymint-V2-java-source",
		":android.hardware.security.secureclock-V1-java-source",
		@@ -271,8 +271,6 @@ java_defaults {
		include_dirs: [
		"frameworks/av/aidl",
		"frameworks/native/libs/permission/aidl",
		// TODO: remove when moved to the below package
		"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
		"packages/modules/Bluetooth/framework/aidl-export",
		"packages/modules/Connectivity/framework/aidl-export",
		"packages/modules/Media/apex/aidl/stable",
		@@ -325,9 +323,11 @@ java_defaults {
		"av-types-aidl-java",
		"tv_tuner_resource_manager_aidl_interface-java",
		"soundtrigger_middleware-aidl-java",
		"modules-utils-build",
		"modules-utils-preconditions",
		"modules-utils-synchronous-result-receiver",
		"modules-utils-os",
		"modules-utils-uieventlogger-interface",
		"framework-permission-aidl-java",
		"spatializer-aidl-java",
		"audiopolicy-types-aidl-java",
		@@ -529,8 +529,6 @@ stubs_defaults {
		include_dirs: [
		"frameworks/av/aidl",
		"frameworks/native/libs/permission/aidl",
		// TODO: remove when moved to the below package
		"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
		"packages/modules/Bluetooth/framework/aidl-export",
		"packages/modules/Connectivity/framework/aidl-export",
		"packages/modules/Media/apex/aidl/stable",

ApiDocs.bp

+8 −8

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ droiddoc {
		"android.whichdoc offline",
		],
		compat_config: ":global-compat-config",
		proofread_file: "offline-sdk-docs-proofrerad.txt",
		proofread_file: "offline-sdk-docs-proofread.txt",
		args: framework_docs_only_args + " -offlinemode -title \"Android SDK\"",
		static_doc_index_redirect: "docs/docs-preview-index.html",
		}
		@@ -248,7 +248,7 @@ droiddoc {
		hdf: [
		"android.whichdoc offline",
		],
		proofread_file: "offline-sdk-referenceonly-docs-proofrerad.txt",
		proofread_file: "offline-sdk-referenceonly-docs-proofread.txt",
		args: framework_docs_only_args + " -offlinemode -title \"Android SDK\" -referenceonly",
		static_doc_index_redirect: "docs/docs-documentation-redirect.html",
		static_doc_properties: "docs/source.properties",
		@@ -266,7 +266,7 @@ droiddoc {
		hdf: [
		"android.whichdoc offline",
		],
		proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt",
		proofread_file: "offline-system-sdk-referenceonly-docs-proofread.txt",
		args: framework_docs_only_args + " -hide 101 -hide 104 -hide 108" +
		" -offlinemode -title \"Android System SDK\" -referenceonly",
		static_doc_index_redirect: "docs/docs-documentation-redirect.html",
		@@ -283,7 +283,7 @@ droiddoc {
		"android.whichdoc online",
		"android.hasSamples true",
		],
		proofread_file: "online-sdk-docs-proofrerad.txt",
		proofread_file: "online-sdk-docs-proofread.txt",
		args: framework_docs_only_args +
		" -toroot / -samplegroup Admin " +
		" -samplegroup Background " +
		@@ -312,7 +312,7 @@ droiddoc {
		"android.whichdoc online",
		"android.hasSamples true",
		],
		proofread_file: "online-system-api-sdk-docs-proofrerad.txt",
		proofread_file: "online-system-api-sdk-docs-proofread.txt",
		args: framework_docs_only_args +
		" -referenceonly " +
		" -title \"Android SDK - Including system APIs.\" " +
		@@ -347,7 +347,7 @@ droiddoc {
		"android.whichdoc online",
		"android.hasSamples true",
		],
		proofread_file: "ds-docs-proofrerad.txt",
		proofread_file: "ds-docs-proofread.txt",
		args: framework_docs_only_args +
		" -toroot / -yamlV2 -metalavaApiSince -samplegroup Admin " +
		" -samplegroup Background " +
		@@ -458,7 +458,7 @@ droiddoc {
		"android.whichdoc online",
		"android.hasSamples true",
		],
		proofread_file: "online-sdk-dev-docs-proofrerad.txt",
		proofread_file: "online-sdk-dev-docs-proofread.txt",
		args: framework_docs_only_args +
		" -toroot / -samplegroup Admin " +
		" -samplegroup Background " +
		@@ -483,7 +483,7 @@ droiddoc {
		srcs: [
		":framework-doc-stubs",
		],
		proofread_file: "hidden-docs-proofrerad.txt",
		proofread_file: "hidden-docs-proofread.txt",
		args: framework_docs_only_args +
		" -referenceonly " +
		" -title \"Android SDK - Including hidden APIs.\"",

OWNERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,5 +31,6 @@ per-file /res/values/.xml = byi@google.com, delphij@google.com

		per-file *.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION}
		per-file Android.mk = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION}
		per-file framework-jarjar-rules.txt = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION}
		per-file TestProtoLibraries.bp = file:platform/platform_testing:/libraries/health/OWNERS
		per-file TestProtoLibraries.bp = file:platform/tools/tradefederation:/OWNERS

TRACE_OWNERS

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		# OWNERS of Trace-related files
		primiano@google.com
		timmurray@google.com
		jjaggi@google.com
		jreck@google.com

apct-tests/perftests/blobstore/Android.bp

+14 −13

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ android_test {
		"apct-perftests-utils",
		"ub-uiautomator",
		"collector-device-lib-platform",
		"androidx.benchmark_benchmark-macro",
		],
		platform_apis: true,
		test_suites: ["device-tests"],