Run bpf_existence_test in mainline-postsubmit. am: da0c43e38f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949798
Change-Id: I0de34221f3217ed5602fa48d811771aa20638722
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index f1897f5..c532859 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -122,3 +122,17 @@
"framework-res",
],
}
+
+// Defaults for native tests that want to run in mainline-presubmit.
+// Not widely used (or present for Java) because many of our tests have AndroidTest.xml files and
+// use the mainline-param config-descriptor metadata in AndroidTest.xml.
+cc_defaults {
+ name: "connectivity-mainline-presubmit-cc-defaults",
+ // test_mainline_modules is an array of strings. Each element in the array is a list of modules
+ // separated by "+". The modules in this list must be in alphabetical order.
+ // See SuiteModuleLoader.java.
+ // TODO: why are the modules separated by + instead of being separate entries in the array?
+ test_mainline_modules: [
+ "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex",
+ ],
+}
diff --git a/tests/mts/Android.bp b/tests/mts/Android.bp
index a56f76e..2c44010 100644
--- a/tests/mts/Android.bp
+++ b/tests/mts/Android.bp
@@ -23,6 +23,9 @@
"general-tests",
"mts-tethering",
],
+ defaults: [
+ "connectivity-mainline-presubmit-cc-defaults",
+ ],
require_root: true,
static_libs: [
"libbase",