Add defaults to enable/disable NetworkStackNext
The defaults can be used to enable/disable NetworkStackNext targets
depending on the branch, while minimizing merge conflicts.
NetworkStackNext may need to be disabled in branches that only have
the latest stable SDK available, as it uses unstable APIs.
Test: builds
Change-Id: I78e8c7722edf2f2d22ab716315ed41ba3dcdfd2c
diff --git a/Android.bp b/Android.bp
index c40c3fb..4f0ac37 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,17 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
+// Defaults to enable/disable java targets that depend on
+// NetworkStackNext, which uses development APIs. "enabled" may
+// have a different value depending on the branch.
+java_defaults {
+ name: "NetworkStackNextEnableDefaults",
+ enabled: true,
+}
+// This is a placeholder comment to avoid merge conflicts
+// as the above target may have different "enabled" values
+// depending on the branch
+
java_defaults {
name: "NetworkStackDevApiLevel",
min_sdk_version: "29",
@@ -231,7 +242,11 @@
// The versions of the android library containing network stack code compiled for each SDK variant.
android_library {
name: "NetworkStackApiCurrentLib",
- defaults: ["NetworkStackDevApiLevel", "NetworkStackAndroidLibraryDefaults"],
+ defaults: [
+ "NetworkStackDevApiLevel",
+ "NetworkStackAndroidLibraryDefaults",
+ "NetworkStackNextEnableDefaults",
+ ],
srcs: [
"src/**/*.java",
":statslog-networkstack-java-gen-current"
@@ -304,7 +319,11 @@
// Non-updatable network stack running in the system server process for devices not using the module
android_app {
name: "InProcessNetworkStack",
- defaults: [ "NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
+ defaults: [
+ "NetworkStackAppDefaults",
+ "NetworkStackDevApiLevel",
+ "NetworkStackNextEnableDefaults",
+ ],
static_libs: ["NetworkStackApiCurrentLib"],
certificate: "platform",
manifest: "AndroidManifest_InProcess.xml",
@@ -322,7 +341,11 @@
// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
android_library {
name: "NetworkStackNextManifestBase",
- defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
+ defaults: [
+ "NetworkStackAppDefaults",
+ "NetworkStackDevApiLevel",
+ "NetworkStackNextEnableDefaults",
+ ],
static_libs: ["NetworkStackApiCurrentLib"],
manifest: "AndroidManifest.xml"
}
@@ -330,7 +353,11 @@
// NetworkStack build targeting the current API release, for testing on in-development SDK
android_app {
name: "NetworkStackNext",
- defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
+ defaults: [
+ "NetworkStackAppDefaults",
+ "NetworkStackDevApiLevel",
+ "NetworkStackNextEnableDefaults",
+ ],
static_libs: ["NetworkStackNextManifestBase"],
certificate: "networkstack",
manifest: "AndroidManifest_Next.xml",