Merge "Run bpfmt on StubLibraries.bp" am: cf54ae883b am: 38658a5658 am: 30d0c52c6a (22efcf85) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+65 −26

Original line number	Original line	Diff line number	Diff line
	@@ -123,13 +123,19 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/public/api",		dir: "apistubs/android/public/api",
	dest: "android-non-updatable.txt",		dest: "android-non-updatable.txt",
	tag: ".api.txt",		tag: ".api.txt",
	},		},
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/public/api",		dir: "apistubs/android/public/api",
	dest: "android-non-updatable-removed.txt",		dest: "android-non-updatable-removed.txt",
	tag: ".removed-api.txt",		tag: ".removed-api.txt",
	@@ -137,20 +143,17 @@ droidstubs {
	],		],
	}		}

	priv_apps =		priv_apps = " --show-annotation android.annotation.SystemApi\\(" +
	" --show-annotation android.annotation.SystemApi\\(" +
	"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +		"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
	"\\)"		"\\)"

	priv_apps_in_stubs =		priv_apps_in_stubs = " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +
	" --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +
	"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +		"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
	"\\)"		"\\)"

	test = " --show-annotation android.annotation.TestApi"		test = " --show-annotation android.annotation.TestApi"

	module_libs =		module_libs = " --show-annotation android.annotation.SystemApi\\(" +
	" --show-annotation android.annotation.SystemApi\\(" +
	"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +		"client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +
	"\\)"		"\\)"

	@@ -166,7 +169,7 @@ droidstubs {
	last_released: {		last_released: {
	api_file: ":android-non-updatable.api.system.latest",		api_file: ":android-non-updatable.api.system.latest",
	removed_api_file: ":android-non-updatable-removed.api.system.latest",		removed_api_file: ":android-non-updatable-removed.api.system.latest",
	baseline_file: ":android-non-updatable-incompatibilities.api.system.latest"		baseline_file: ":android-non-updatable-incompatibilities.api.system.latest",
	},		},
	api_lint: {		api_lint: {
	enabled: true,		enabled: true,
	@@ -176,13 +179,19 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/system/api",		dir: "apistubs/android/system/api",
	dest: "android-non-updatable.txt",		dest: "android-non-updatable.txt",
	tag: ".api.txt",		tag: ".api.txt",
	},		},
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/system/api",		dir: "apistubs/android/system/api",
	dest: "android-non-updatable-removed.txt",		dest: "android-non-updatable-removed.txt",
	tag: ".removed-api.txt",		tag: ".removed-api.txt",
	@@ -206,25 +215,37 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/test/api",		dir: "apistubs/android/test/api",
	dest: "android.txt",		dest: "android.txt",
	tag: ".api.txt",		tag: ".api.txt",
	},		},
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/test/api",		dir: "apistubs/android/test/api",
	dest: "removed.txt",		dest: "removed.txt",
	tag: ".removed-api.txt",		tag: ".removed-api.txt",
	},		},
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/test/api",		dir: "apistubs/android/test/api",
	dest: "android-non-updatable.txt",		dest: "android-non-updatable.txt",
	tag: ".api.txt",		tag: ".api.txt",
	},		},
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/test/api",		dir: "apistubs/android/test/api",
	dest: "android-non-updatable-removed.txt",		dest: "android-non-updatable-removed.txt",
	tag: ".removed-api.txt",		tag: ".removed-api.txt",
	@@ -252,13 +273,19 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/module-lib/api",		dir: "apistubs/android/module-lib/api",
	dest: "android-non-updatable.txt",		dest: "android-non-updatable.txt",
	tag: ".api.txt",		tag: ".api.txt",
	},		},
	{		{
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	dir: "apistubs/android/module-lib/api",		dir: "apistubs/android/module-lib/api",
	dest: "android-non-updatable-removed.txt",		dest: "android-non-updatable-removed.txt",
	tag: ".removed-api.txt",		tag: ".removed-api.txt",
	@@ -318,10 +345,13 @@ java_defaults {
	java_version: "1.8",		java_version: "1.8",
	compile_dex: true,		compile_dex: true,
	dist: {		dist: {
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	tag: ".jar",		tag: ".jar",
	dest: "android-non-updatable.jar",		dest: "android-non-updatable.jar",
	}		},
	}		}

	java_library_static {		java_library_static {
	@@ -380,7 +410,10 @@ java_defaults {
	java_defaults {		java_defaults {
	name: "android_stubs_dists_default",		name: "android_stubs_dists_default",
	dist: {		dist: {
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	tag: ".jar",		tag: ".jar",
	dest: "android.jar",		dest: "android.jar",
	},		},
	@@ -411,7 +444,10 @@ java_library_static {
	dists: [		dists: [
	{		{
	// Legacy dist path		// Legacy dist path
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	tag: ".jar",		tag: ".jar",
	dest: "android_system.jar",		dest: "android_system.jar",
	},		},
	@@ -436,7 +472,10 @@ java_library_static {
	dists: [		dists: [
	{		{
	// Legacy dist path		// Legacy dist path
	targets: ["sdk", "win_sdk"],		targets: [
			"sdk",
			"win_sdk",
			],
	tag: ".jar",		tag: ".jar",
	dest: "android_test.jar",		dest: "android_test.jar",
	},		},