Merge "Revert "Use framework-appsearch-stubs instead of framework-appsearch"" (3ead8093) · Commits · e / os / android_frameworks_base

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -487,7 +487,7 @@ java_library {
		"framework-minus-apex",
		"updatable_media_stubs",
		"framework_mediaprovider_stubs",
		"framework-appsearch-stubs",
		"framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
		"framework-sdkextensions-stubs-systemapi",
		// TODO(b/146167933): Use framework-statsd-stubs instead.
		"framework-statsd",

+25 −4

Original line number	Diff line number	Diff line
		@@ -30,10 +30,29 @@ java_library {
		libs: [
		"framework-minus-apex", // TODO(b/146218515) should be framework-system-stubs
		],
		visibility: ["//frameworks/base/apex/appsearch:__subpackages__"],
		visibility: [
		"//frameworks/base/apex/appsearch:__subpackages__",
		// TODO(b/146218515) remove this when framework is built with the stub of appsearch
		"//frameworks/base",
		],
		apex_available: ["com.android.appsearch"],
		}

		metalava_appsearch_docs_args =
		"--hide-package com.android.server " +
		"--error UnhiddenSystemApi " +
		"--hide RequiresPermission " +
		"--hide MissingPermission " +
		"--hide BroadcastBehavior " +
		"--hide HiddenSuperclass " +
		"--hide DeprecationMismatch " +
		"--hide UnavailableSymbol " +
		"--hide SdkConstant " +
		"--hide HiddenTypeParameter " +
		"--hide Todo --hide Typo " +
		"--hide HiddenTypedefConstant " +
		"--show-annotation android.annotation.SystemApi "

		droidstubs {
		name: "framework-appsearch-stubs-srcs",
		srcs: [
		@@ -43,8 +62,9 @@ droidstubs {
		aidl: {
		include_dirs: ["frameworks/base/core/java"],
		},
		defaults: ["framework-module-stubs-defaults-systemapi"],
		sdk_version: "system_current",
		args: metalava_appsearch_docs_args,
		sdk_version: "core_current",
		libs: ["android_system_stubs_current"],
		}

		java_library {
		@@ -55,6 +75,7 @@ java_library {
		"java",
		],
		},
		sdk_version: "system_current",
		sdk_version: "core_current",
		libs: ["android_system_stubs_current"],
		installable: false,
		}

+0 −1