Use Ipv6Utils to build ND packets and options in IpClientIntegrationTest. am: af32144ec2 am: 69661ef02b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1579843
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95f81f97a2f2acdc2a12cd56f08576dcdab48b71
diff --git a/Android.bp b/Android.bp
index 149245e..997ed97 100644
--- a/Android.bp
+++ b/Android.bp
@@ -113,6 +113,7 @@
// integer so if the next SDK release happens to use that integer, we don't need to rename them.
java_library {
name: "NetworkStackApi31Shims",
+ enabled: false, // Disabled in mainline-prod
defaults: ["NetworkStackShimsDefaults"],
srcs: [
"apishim/31/**/*.java",
@@ -132,6 +133,7 @@
// called directly by the networkstack code.
java_library {
name: "NetworkStackApiCurrentShims",
+ enabled: false, // Disabled in mainline-prod
defaults: ["NetworkStackShimsDefaults"],
static_libs: [
"NetworkStackShimsCommon",
@@ -197,6 +199,14 @@
],
static_libs: ["NetworkStackApiCurrentShims"],
manifest: "AndroidManifestBase.xml",
+ enabled: false, // Disabled in mainline-prod
+ visibility: [
+ "//frameworks/base/tests/net/integration",
+ "//packages/modules/Connectivity/Tethering/tests/integration",
+ "//packages/modules/Connectivity/tests/cts/net",
+ "//packages/modules/NetworkStack/tests/unit",
+ "//packages/modules/NetworkStack/tests/integration",
+ ],
}
android_library {
@@ -208,6 +218,13 @@
],
static_libs: ["NetworkStackApiStableShims"],
manifest: "AndroidManifestBase.xml",
+ visibility: [
+ "//frameworks/base/tests/net/integration",
+ "//packages/modules/Connectivity/Tethering/tests/integration",
+ "//packages/modules/Connectivity/tests/cts/net",
+ "//packages/modules/NetworkStack/tests/unit",
+ "//packages/modules/NetworkStack/tests/integration",
+ ],
}
filegroup {
@@ -216,7 +233,6 @@
visibility: [
"//packages/modules/NetworkStack/tests/unit",
"//packages/modules/NetworkStack/tests/integration",
- "//frameworks/base/packages/Tethering/tests/integration",
"//packages/modules/Connectivity/Tethering/tests/integration",
]
}
@@ -251,6 +267,7 @@
// The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces
// the default CaptivePortalLogin.
required: ["PlatformNetworkPermissionConfig", "PlatformCaptivePortalLogin"],
+ enabled: false, // Disabled in mainline-prod
}
// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
@@ -258,7 +275,8 @@
name: "NetworkStackNextManifestBase",
defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
static_libs: ["NetworkStackApiCurrentLib"],
- manifest: "AndroidManifest.xml"
+ manifest: "AndroidManifest.xml",
+ enabled: false, // Disabled in mainline-prod
}
// NetworkStack build targeting the current API release, for testing on in-development SDK
@@ -270,6 +288,7 @@
manifest: "AndroidManifest_Next.xml",
// The permission configuration *must* be included to ensure security of the device
required: ["NetworkPermissionConfig"],
+ enabled: false, // Disabled in mainline-prod
}
// Updatable network stack for finalized API
@@ -284,19 +303,6 @@
updatable: true,
}
-// Android library to derive test APKs for integration tests
-android_library {
- name: "TestNetworkStackLib",
- defaults: ["NetworkStackAppDefaults", "NetworkStackReleaseApiLevel"],
- static_libs: ["NetworkStackApiStableLib"],
- manifest: "AndroidManifestBase.xml",
- visibility: [
- "//frameworks/base/tests/net/integration",
- "//cts/tests/tests/net",
- "//packages/modules/Connectivity/tests/cts/net",
- ],
-}
-
cc_library_shared {
name: "libnetworkstackutilsjni",
srcs: [
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b61c89f..55357a8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,8 +19,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.networkstack"
android:sharedUserId="android.uid.networkstack"
- android:versionCode="300900700"
- android:versionName="r_aml_300900700"
+ android:versionCode="309999900"
+ android:versionName="r_aml_309999900"
>
<!-- Permissions must be defined here, and not in the base manifest, as the network stack
running in the system server process does not need any permission, and having privileged
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index 875b089..2cffc3d 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -87,6 +87,7 @@
certificate: "networkstack",
platform_apis: true,
test_suites: ["device-tests"],
+ enabled: false, // Disabled in mainline-prod
}
// The static lib needs to be jarjared by each module so they do not conflict with each other
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index c0c6276..e308b96 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -58,6 +58,7 @@
defaults: ["NetworkStackTestsDefaults"],
static_libs: ["NetworkStackApiCurrentLib"],
compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit
+ enabled: false, // Disabled in mainline-prod
}
// Library containing the unit tests. This is used by the coverage test target to pull in the