Merge "Rename module dist files" am: 2b4926b52b (4ca6df32) · Commits · e / os / android_frameworks_base

apex/sdkextensions/framework/Android.bp

+11 −7

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ stubs_defaults {
	name: "framework-sdkextensions-stubs-defaults",		name: "framework-sdkextensions-stubs-defaults",
	srcs: [ ":framework-sdkextensions-sources" ],		srcs: [ ":framework-sdkextensions-sources" ],
	libs: [ "framework-annotations-lib" ],		libs: [ "framework-annotations-lib" ],
			dist: { dest: "framework-sdkextensions.txt" },
	}		}

	droidstubs {		droidstubs {
	@@ -55,7 +56,7 @@ droidstubs {
	defaults: [		defaults: [
	"framework-module-stubs-defaults-publicapi",		"framework-module-stubs-defaults-publicapi",
	"framework-sdkextensions-stubs-defaults",		"framework-sdkextensions-stubs-defaults",
	]		],
	}		}

	droidstubs {		droidstubs {
	@@ -63,7 +64,7 @@ droidstubs {
	defaults: [		defaults: [
	"framework-module-stubs-defaults-systemapi",		"framework-module-stubs-defaults-systemapi",
	"framework-sdkextensions-stubs-defaults",		"framework-sdkextensions-stubs-defaults",
	]		],
	}		}

	droidstubs {		droidstubs {
	@@ -71,7 +72,7 @@ droidstubs {
	defaults: [		defaults: [
	"framework-module-api-defaults-module_libs_api",		"framework-module-api-defaults-module_libs_api",
	"framework-sdkextensions-stubs-defaults",		"framework-sdkextensions-stubs-defaults",
	]		],
	}		}

	droidstubs {		droidstubs {
	@@ -79,7 +80,7 @@ droidstubs {
	defaults: [		defaults: [
	"framework-module-stubs-defaults-module_libs_api",		"framework-module-stubs-defaults-module_libs_api",
	"framework-sdkextensions-stubs-defaults",		"framework-sdkextensions-stubs-defaults",
	]		],
	}		}

	java_library {		java_library {
	@@ -89,7 +90,8 @@ java_library {
	visibility: [		visibility: [
	"//frameworks/base", // Framework		"//frameworks/base", // Framework
	"//frameworks/base/apex/sdkextensions", // sdkextensions SDK		"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
	]		],
			dist: { dest: "framework-sdkextensions.jar" },
	}		}

	java_library {		java_library {
	@@ -99,7 +101,8 @@ java_library {
	visibility: [		visibility: [
	"//frameworks/base", // Framework		"//frameworks/base", // Framework
	"//frameworks/base/apex/sdkextensions", // sdkextensions SDK		"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
	]		],
			dist: { dest: "framework-sdkextensions.jar" },
	}		}

	java_library {		java_library {
	@@ -109,5 +112,6 @@ java_library {
	visibility: [		visibility: [
	"//frameworks/base", // Framework		"//frameworks/base", // Framework
	"//frameworks/base/apex/sdkextensions", // sdkextensions SDK		"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
	]		],
			dist: { dest: "framework-sdkextensions.jar" },
	}		}

packages/Tethering/common/TetheringLib/Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,7 @@ java_library {
	stubs_defaults {		stubs_defaults {
	name: "framework-tethering-stubs-defaults",		name: "framework-tethering-stubs-defaults",
	srcs: [":framework-tethering-srcs"],		srcs: [":framework-tethering-srcs"],
			dist: { dest: "framework-tethering.txt" },
	}		}

	filegroup {		filegroup {
	@@ -123,16 +124,19 @@ java_library {
	name: "framework-tethering-stubs-publicapi",		name: "framework-tethering-stubs-publicapi",
	srcs: [":framework-tethering-stubs-srcs-publicapi"],		srcs: [":framework-tethering-stubs-srcs-publicapi"],
	defaults: ["framework-module-stubs-lib-defaults-publicapi"],		defaults: ["framework-module-stubs-lib-defaults-publicapi"],
			dist: { dest: "framework-tethering.jar" },
	}		}

	java_library {		java_library {
	name: "framework-tethering-stubs-systemapi",		name: "framework-tethering-stubs-systemapi",
	srcs: [":framework-tethering-stubs-srcs-systemapi"],		srcs: [":framework-tethering-stubs-srcs-systemapi"],
	defaults: ["framework-module-stubs-lib-defaults-systemapi"],		defaults: ["framework-module-stubs-lib-defaults-systemapi"],
			dist: { dest: "framework-tethering.jar" },
	}		}

	java_library {		java_library {
	name: "framework-tethering-stubs-module_libs_api",		name: "framework-tethering-stubs-module_libs_api",
	srcs: [":framework-tethering-stubs-srcs-module_libs_api"],		srcs: [":framework-tethering-stubs-srcs-module_libs_api"],
	defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],		defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
			dist: { dest: "framework-tethering.jar" },
	}		}