Merge "Dist more API txt files" (45b39d81) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+68 −5

Original line number	Diff line number	Diff line
		@@ -120,6 +120,20 @@ droidstubs {
		new_since: ":android-non-updatable.api.public.latest",
		},
		},
		dists: [
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/public/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/public/api",
		dest: "android-non-updatable-removed.txt",
		tag: ".removed-api.txt",
		},
		],
		}

		priv_apps =
		@@ -159,6 +173,20 @@ droidstubs {
		baseline_file: "core/api/system-lint-baseline.txt",
		},
		},
		dists: [
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system/api",
		dest: "android-non-updatable-removed.txt",
		tag: ".removed-api.txt",
		},
		],
		}

		droidstubs {
		@@ -175,11 +203,32 @@ droidstubs {
		baseline_file: "core/api/test-lint-baseline.txt",
		},
		},
		dist: {
		dists: [
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/test/api",
		dest: "android.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/test/api",
		dest: "removed.txt",
		tag: ".removed-api.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/test/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/test/api",
		dest: "android-non-updatable-removed.txt",
		tag: ".removed-api.txt",
		},
		],
		}

		droidstubs {
		@@ -200,6 +249,20 @@ droidstubs {
		new_since: ":android-non-updatable.api.module-lib.latest",
		},
		},
		dists: [
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/module-lib/api",
		dest: "android-non-updatable.txt",
		tag: ".api.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/module-lib/api",
		dest: "android-non-updatable-removed.txt",
		tag: ".removed-api.txt",
		},
		],
		}

		/////////////////////////////////////////////////////////////////////

api/Android.bp

+18 −12

Original line number	Diff line number	Diff line
		@@ -50,10 +50,7 @@ genrule {
		dest: "current.txt",
		},
		{
		targets: [
		"sdk",
		"win_sdk",
		],
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/public/api",
		dest: "android.txt",
		},
		@@ -106,6 +103,11 @@ genrule {
		dir: "api",
		dest: "removed.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/public/api",
		dest: "removed.txt",
		},
		],
		}

		@@ -131,10 +133,7 @@ genrule {
		dest: "system-current.txt",
		},
		{
		targets: [
		"sdk",
		"win_sdk",
		],
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system/api",
		dest: "android.txt",
		},
		@@ -163,6 +162,11 @@ genrule {
		dir: "api",
		dest: "system-removed.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system/api",
		dest: "removed.txt",
		},
		],
		visibility: ["//visibility:public"],
		}
		@@ -189,10 +193,7 @@ genrule {
		dest: "module-lib-current.txt",
		},
		{
		targets: [
		"sdk",
		"win_sdk",
		],
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/module-lib/api",
		dest: "android.txt",
		},
		@@ -220,6 +221,11 @@ genrule {
		dir: "api",
		dest: "module-lib-removed.txt",
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/module-lib/api",
		dest: "removed.txt",
		},
		],
		}

services/Android.bp

+14 −5

Original line number	Diff line number	Diff line
		@@ -147,11 +147,20 @@ droidstubs {
		baseline_file: "api/lint-baseline.txt",
		},
		},
		dist: {
		dists: [
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system-server/api",
		dest: "android.txt",
		tag: ".api.txt"
		},
		{
		targets: ["sdk", "win_sdk"],
		dir: "apistubs/android/system-server/api",
		dest: "removed.txt",
		tag: ".removed-api.txt",
		},
		]
		}

		java_library {