From b34ed63a36062077b9f5132864708039b269d728 Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Mon, 1 Mar 2021 13:56:29 +0900
Subject: [PATCH] Disable CtsNetTestCases in mainline-prod.

This currently still builds, but it will stop building as soon
as we make it depend on the networkstack current shims. It should
not be used for anything in mainline-prod anyway, everything uses
CtsNetTestCasesLatestSdk.

The Merged-In clause is from unrelated change aosp/1542627 and is
intended to ensure this change does not propagate to any
downstream branches.

Bug: 167645754
Test: mmm packages/modules/Connectivity
Change-Id: Ib47b181902e8e634f419e5544472859760c2ce77
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
---
 tests/cts/net/Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index 4c5950d802..24710f1599 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -71,6 +71,7 @@ java_defaults {
 // devices.
 android_test {
     name: "CtsNetTestCases",
+    enabled: false, // Disabled in mainline-prod
     defaults: ["CtsNetTestCasesDefaults"],
     test_suites: [
         "cts",