Merge "Remove references to win_sdk" am: dddbdc3b15 am: a9e069273a (d8393273) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+13 −52

Original line number	Original line	Diff line number	Diff line
	@@ -59,19 +59,13 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: [		targets: ["sdk"],
	"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: [		targets: ["sdk"],
	"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",
	@@ -115,19 +109,13 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: [		targets: ["sdk"],
	"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: [		targets: ["sdk"],
	"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",
	@@ -151,37 +139,25 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: [		targets: ["sdk"],
	"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: [		targets: ["sdk"],
	"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: [		targets: ["sdk"],
	"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: [		targets: ["sdk"],
	"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",
	@@ -210,19 +186,13 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: [		targets: ["sdk"],
	"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: [		targets: ["sdk"],
	"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",
	@@ -282,10 +252,7 @@ java_defaults {
	java_version: "1.8",		java_version: "1.8",
	compile_dex: true,		compile_dex: true,
	dist: {		dist: {
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	tag: ".jar",		tag: ".jar",
	dest: "android-non-updatable.jar",		dest: "android-non-updatable.jar",
	},		},
	@@ -341,10 +308,7 @@ java_library {
	java_defaults {		java_defaults {
	name: "android_stubs_dists_default",		name: "android_stubs_dists_default",
	dist: {		dist: {
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	tag: ".jar",		tag: ".jar",
	dest: "android.jar",		dest: "android.jar",
	},		},
	@@ -376,10 +340,7 @@ java_library {
	dists: [		dists: [
	{		{
	// Legacy dist path		// Legacy dist path
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	tag: ".jar",		tag: ".jar",
	dest: "android_system.jar",		dest: "android_system.jar",
	},		},

api/Android.bp

+9 −36

Original line number	Original line	Diff line number	Diff line
	@@ -120,10 +120,7 @@ genrule {
	dest: "current.txt",		dest: "current.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/public/api",		dir: "apistubs/android/public/api",
	dest: "android.txt",		dest: "android.txt",
	},		},
	@@ -205,10 +202,7 @@ genrule {
	dest: "removed.txt",		dest: "removed.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/public/api",		dir: "apistubs/android/public/api",
	dest: "removed.txt",		dest: "removed.txt",
	},		},
	@@ -244,10 +238,7 @@ genrule {
	dest: "system-current.txt",		dest: "system-current.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/system/api",		dir: "apistubs/android/system/api",
	dest: "android.txt",		dest: "android.txt",
	},		},
	@@ -302,10 +293,7 @@ genrule {
	dest: "system-removed.txt",		dest: "system-removed.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/system/api",		dir: "apistubs/android/system/api",
	dest: "removed.txt",		dest: "removed.txt",
	},		},
	@@ -342,10 +330,7 @@ genrule {
	dest: "module-lib-current.txt",		dest: "module-lib-current.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/module-lib/api",		dir: "apistubs/android/module-lib/api",
	dest: "android.txt",		dest: "android.txt",
	},		},
	@@ -402,10 +387,7 @@ genrule {
	dest: "module-lib-removed.txt",		dest: "module-lib-removed.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/module-lib/api",		dir: "apistubs/android/module-lib/api",
	dest: "removed.txt",		dest: "removed.txt",
	},		},
	@@ -446,10 +428,7 @@ genrule {
	dest: "system-server-current.txt",		dest: "system-server-current.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/system-server/api",		dir: "apistubs/android/system-server/api",
	dest: "android.txt",		dest: "android.txt",
	},		},
	@@ -473,10 +452,7 @@ genrule {
	dest: "system-server-removed.txt",		dest: "system-server-removed.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/system-server/api",		dir: "apistubs/android/system-server/api",
	dest: "removed.txt",		dest: "removed.txt",
	},		},
	@@ -514,9 +490,6 @@ genrule {
	tools: ["api_versions_trimmer"],		tools: ["api_versions_trimmer"],
	cmd: "$(location api_versions_trimmer) $(out) $(in)",		cmd: "$(location api_versions_trimmer) $(out) $(in)",
	dist: {		dist: {
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	},		},
	}		}

services/Android.bp

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -221,19 +221,13 @@ droidstubs {
	},		},
	dists: [		dists: [
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/system-server/api",		dir: "apistubs/android/system-server/api",
	dest: "android-non-updatable.txt",		dest: "android-non-updatable.txt",
	tag: ".api.txt",		tag: ".api.txt",
	},		},
	{		{
	targets: [		targets: ["sdk"],
	"sdk",
	"win_sdk",
	],
	dir: "apistubs/android/system-server/api",		dir: "apistubs/android/system-server/api",
	dest: "android-non-updatable-removed.txt",		dest: "android-non-updatable-removed.txt",
	tag: ".removed-api.txt",		tag: ".removed-api.txt",

test-legacy/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
	include $(BUILD_STATIC_JAVA_LIBRARY)		include $(BUILD_STATIC_JAVA_LIBRARY)

	# Archive a copy of the classes.jar in SDK build.		# Archive a copy of the classes.jar in SDK build.
	$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.legacy.jar)		$(call dist-for-goals,sdk,$(full_classes_jar):android.test.legacy.jar)

	endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true		endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true