Merge "Create all variants of stubs for tethering" am: 9814b482cb (293a85c6) · Commits · e / os / android_frameworks_base

Android.bp

+2 −3

Original line number	Diff line number	Diff line
		@@ -456,7 +456,7 @@ java_library {
		defaults: ["framework-defaults"],
		srcs: [":framework-non-updatable-sources"],
		libs: [
		"framework-tethering-stubs",
		"framework-tethering-stubs-module_libs_api",
		],
		installable: true,
		javac_shard_size: 150,
		@@ -496,7 +496,7 @@ java_library {
		"framework-minus-apex",
		"updatable_media_stubs",
		"framework-sdkextensions-stubs-systemapi",
		"framework-tethering-stubs",
		"framework-tethering-stubs-module_libs_api",
		],
		sdk_version: "core_platform",
		apex_available: ["//apex_available:platform"],
		@@ -511,7 +511,6 @@ java_library {
		visibility: [
		// DO NOT ADD ANY MORE ENTRIES TO THIS LIST
		"//external/robolectric-shadows:__subpackages__",
		"//frameworks/base/packages/Tethering/common/TetheringLib:__subpackages__",
		"//frameworks/layoutlib:__subpackages__",
		"//frameworks/opt/net/ike:__subpackages__",
		],

packages/Tethering/common/TetheringLib/Android.bp

+53 −15

Original line number	Diff line number	Diff line
		@@ -62,26 +62,14 @@ java_library {
		apex_available: ["com.android.tethering"],
		}

		droidstubs {
		name: "framework-tethering-stubs-sources",
		defaults: ["framework-module-stubs-defaults-module_libs_api"],
		stubs_defaults {
		name: "framework-tethering-stubs-defaults",
		srcs: [
		"src/android/net/TetheredClient.java",
		"src/android/net/TetheringManager.java",
		"src/android/net/TetheringConstants.java",
		],
		libs: [
		"tethering-aidl-interfaces-java",
		"framework-all",
		],
		sdk_version: "core_platform",
		}

		java_library {
		name: "framework-tethering-stubs",
		srcs: [":framework-tethering-stubs-sources"],
		libs: ["framework-all"],
		sdk_version: "core_platform",
		libs: ["tethering-aidl-interfaces-java"],
		}

		filegroup {
		@@ -101,3 +89,53 @@ filegroup {
		],
		path: "src"
		}

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

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

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

		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"],
		sdk_version: "current",
		}

		java_library {
		name: "framework-tethering-stubs-systemapi",
		srcs: [":framework-tethering-stubs-srcs-systemapi"],
		sdk_version: "system_current",
		}

		java_library {
		name: "framework-tethering-stubs-module_libs_api",
		srcs: [":framework-tethering-stubs-srcs-module_libs_api"],
		sdk_version: "module_current",
		}

services/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ java_library {

		libs: [
		"android.hidl.manager-V1.0-java",
		"framework-tethering-stubs",
		"framework-tethering-stubs-module_libs_api",
		],

		plugins: [

services/core/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ java_library_static {
		"android.hardware.tv.cec-V1.0-java",
		"android.hardware.vibrator-java",
		"app-compat-annotations",
		"framework-tethering-stubs",
		"framework-tethering-stubs-module_libs_api",
		"ike-stubs",
		],