Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f (3dfbf063) · Commits · e / os / android_frameworks_base

packages/Tethering/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@ java_defaults {
	"net-utils-framework-common",		"net-utils-framework-common",
	],		],
	libs: [		libs: [
	"framework-tethering",		"framework-tethering.impl",
	"framework-wifi-stubs-systemapi",		"framework-wifi-stubs-systemapi",
	"unsupportedappusage",		"unsupportedappusage",
	],		],

packages/Tethering/common/TetheringLib/Android.bp

+9 −92

Original line number	Original line	Diff line number	Diff line
	@@ -13,31 +13,28 @@
	// See the License for the specific language governing permissions and		// See the License for the specific language governing permissions and
	// limitations under the License.		// limitations under the License.

	java_library {		java_sdk_library {
	name: "framework-tethering",		name: "framework-tethering",
	sdk_version: "module_current",		defaults: ["framework-module-defaults"],
	srcs: [		srcs: [
	":framework-tethering-srcs",		":framework-tethering-srcs",
	],		],

			// TODO(b/155480189) - Remove naming_scheme once references have been resolved.
			// Temporary java_sdk_library component naming scheme to use to ease the transition from separate
			// modules to java_sdk_library.
			naming_scheme: "framework-modules",

	jarjar_rules: "jarjar-rules.txt",		jarjar_rules: "jarjar-rules.txt",
	installable: true,		installable: true,

	libs: [
	"framework-annotations-lib",
	],

	hostdex: true, // for hiddenapi check		hostdex: true, // for hiddenapi check
	visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],		visibility: ["//frameworks/base/packages/Tethering:__subpackages__"],
			stubs_library_visibility: ["//visibility:public"],
	apex_available: ["com.android.tethering"],		apex_available: ["com.android.tethering"],
	permitted_packages: ["android.net"],		permitted_packages: ["android.net"],
	}		}

	stubs_defaults {
	name: "framework-tethering-stubs-defaults",
	srcs: [":framework-tethering-srcs"],
	dist: { dest: "framework-tethering.txt" },
	}

	filegroup {		filegroup {
	name: "framework-tethering-srcs",		name: "framework-tethering-srcs",
	srcs: [		srcs: [
	@@ -55,83 +52,3 @@ filegroup {
	],		],
	path: "src"		path: "src"
	}		}

	droidstubs {
	name: "framework-tethering-stubs-srcs-publicapi",
	defaults: [
	"framework-module-stubs-defaults-publicapi",
	"framework-tethering-stubs-defaults",
	],
	check_api: {
	last_released: {
	api_file: ":framework-tethering.api.public.latest",
	removed_api_file: ":framework-tethering-removed.api.public.latest",
	},
	api_lint: {
	new_since: ":framework-tethering.api.public.latest",
	},
	},
	}

	droidstubs {
	name: "framework-tethering-stubs-srcs-systemapi",
	defaults: [
	"framework-module-stubs-defaults-systemapi",
	"framework-tethering-stubs-defaults",
	],
	check_api: {
	last_released: {
	api_file: ":framework-tethering.api.system.latest",
	removed_api_file: ":framework-tethering-removed.api.system.latest",
	},
	api_lint: {
	new_since: ":framework-tethering.api.system.latest",
	},
	},
	}

	droidstubs {
	name: "framework-tethering-api-module_libs_api",
	defaults: [
	"framework-module-api-defaults-module_libs_api",
	"framework-tethering-stubs-defaults",
	],
	check_api: {
	last_released: {
	api_file: ":framework-tethering.api.module-lib.latest",
	removed_api_file: ":framework-tethering-removed.api.module-lib.latest",
	},
	api_lint: {
	new_since: ":framework-tethering.api.module-lib.latest",
	},
	},
	}

	droidstubs {
	name: "framework-tethering-stubs-srcs-module_libs_api",
	defaults: [
	"framework-module-stubs-defaults-module_libs_api",
	"framework-tethering-stubs-defaults",
	],
	}

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

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

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

packages/Tethering/tests/unit/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ java_library {
	sdk_version: "core_platform",		sdk_version: "core_platform",
	libs: [		libs: [
	"framework-minus-apex",		"framework-minus-apex",
	"framework-tethering",		"framework-tethering.impl",
	],		],
	visibility: ["//cts/tests/tests/tethering"],		visibility: ["//cts/tests/tests/tethering"],
	}		}
	@@ -59,7 +59,7 @@ java_defaults {
	"ext",		"ext",
	"framework-minus-apex",		"framework-minus-apex",
	"framework-res",		"framework-res",
	"framework-tethering",		"framework-tethering.impl",
	"framework-wifi-stubs-module_libs_api",		"framework-wifi-stubs-module_libs_api",
	],		],
	jni_libs: [		jni_libs: [