Merge "Conditionally disable NetworkStackApi33Shims" (ea4eb78f) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,8 @@ package {
	default_applicable_licenses: ["Android-Apache-2.0"],		default_applicable_licenses: ["Android-Apache-2.0"],
	}		}

			// TODO: remove this default and replace with ConnectivityNextEnableDefaults. This will need to be
			// done separately in each branch due to merge conflicts.
	// Defaults to enable/disable java targets that depend on		// Defaults to enable/disable java targets that depend on
	// NetworkStackNext, which uses development APIs. "enabled" may		// NetworkStackNext, which uses development APIs. "enabled" may
	// have a different value depending on the branch.		// have a different value depending on the branch.
	@@ -159,7 +161,7 @@ java_library {
	// integer so if the next SDK release happens to use that integer, we don't need to rename them.		// integer so if the next SDK release happens to use that integer, we don't need to rename them.
	java_library {		java_library {
	name: "NetworkStackApi33Shims",		name: "NetworkStackApi33Shims",
	defaults: ["NetworkStackShimsDefaults"],		defaults: ["NetworkStackShimsDefaults", "ConnectivityNextEnableDefaults"],
	srcs: [		srcs: [
	"apishim/33/*/.java",		"apishim/33/*/.java",
	],		],
	@@ -181,7 +183,7 @@ java_library {
	// called directly by the networkstack code.		// called directly by the networkstack code.
	java_library {		java_library {
	name: "NetworkStackApiCurrentShims",		name: "NetworkStackApiCurrentShims",
	defaults: ["NetworkStackShimsDefaults"],		defaults: ["NetworkStackShimsDefaults", "ConnectivityNextEnableDefaults"],
	static_libs: [		static_libs: [
	"NetworkStackShimsCommon",		"NetworkStackShimsCommon",
	"NetworkStackApi29Shims",		"NetworkStackApi29Shims",
	@@ -255,7 +257,7 @@ android_library {
	defaults: [		defaults: [
	"NetworkStackDevApiLevel",		"NetworkStackDevApiLevel",
	"NetworkStackAndroidLibraryDefaults",		"NetworkStackAndroidLibraryDefaults",
	"NetworkStackNextEnableDefaults",		"ConnectivityNextEnableDefaults",
	],		],
	srcs: [		srcs: [
	"src/*/.java",		"src/*/.java",
	@@ -328,7 +330,7 @@ android_app {
	defaults: [		defaults: [
	"NetworkStackAppDefaults",		"NetworkStackAppDefaults",
	"NetworkStackDevApiLevel",		"NetworkStackDevApiLevel",
	"NetworkStackNextEnableDefaults",		"ConnectivityNextEnableDefaults",
	],		],
	static_libs: ["NetworkStackApiCurrentLib"],		static_libs: ["NetworkStackApiCurrentLib"],
	certificate: "platform",		certificate: "platform",
	@@ -350,7 +352,7 @@ android_library {
	defaults: [		defaults: [
	"NetworkStackAppDefaults",		"NetworkStackAppDefaults",
	"NetworkStackDevApiLevel",		"NetworkStackDevApiLevel",
	"NetworkStackNextEnableDefaults",		"ConnectivityNextEnableDefaults",
	],		],
	static_libs: ["NetworkStackApiCurrentLib"],		static_libs: ["NetworkStackApiCurrentLib"],
	manifest: "AndroidManifest.xml"		manifest: "AndroidManifest.xml"
	@@ -362,7 +364,7 @@ android_app {
	defaults: [		defaults: [
	"NetworkStackAppDefaults",		"NetworkStackAppDefaults",
	"NetworkStackDevApiLevel",		"NetworkStackDevApiLevel",
	"NetworkStackNextEnableDefaults",		"ConnectivityNextEnableDefaults",
	],		],
	static_libs: ["NetworkStackNextManifestBase"],		static_libs: ["NetworkStackNextManifestBase"],
	certificate: "networkstack",		certificate: "networkstack",

tests/integration/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,7 @@ android_test {
	defaults: [		defaults: [
	"NetworkStackIntegrationTestsDefaults",		"NetworkStackIntegrationTestsDefaults",
	"NetworkStackIntegrationTestsJniDefaults",		"NetworkStackIntegrationTestsJniDefaults",
	"NetworkStackNextEnableDefaults",		"ConnectivityNextEnableDefaults",
	],		],
	static_libs: [		static_libs: [
	"NetworkStackApiCurrentLib",		"NetworkStackApiCurrentLib",

tests/unit/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -59,7 +59,7 @@ android_test {
	test_suites: ["general-tests"],		test_suites: ["general-tests"],
	defaults: [		defaults: [
	"NetworkStackTestsDefaults",		"NetworkStackTestsDefaults",
	"NetworkStackNextEnableDefaults",		"ConnectivityNextEnableDefaults",
	"connectivity-mainline-presubmit-java-defaults",		"connectivity-mainline-presubmit-java-defaults",
	],		],
	static_libs: ["NetworkStackApiCurrentLib"],		static_libs: ["NetworkStackApiCurrentLib"],