Merge "Move TrackRecordTest to libs/net" am: 339857d3f8 am: 1220fc2be0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1635979
Change-Id: Ic3bc52cc510b370be6844e5380ecbc8208c1a3d9
diff --git a/Android.bp b/Android.bp
index ec62226..2daa1d4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,7 +47,7 @@
// Whether to enable the targets in this file that target current SDKs.
// Set to false in branches like mainline-prod where API classes are too old to build current code.
-enable_current_sdk_targets = true
+enable_current_sdk_targets = false
java_defaults {
name: "NetworkStackDevApiLevel",
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