Move the CtsHostsideNetworkTestsAppNext to avoid automerger conflict
Move the CtsHostsideNetworkTestsAppNext to the top of file to to prevent
any future automerger merge conflict between aosp and downstream
branches. The CtsHostsideNetworkTestsAppNext target will not exist in
some downstream branches, but it should exist in aosp and some
downstream branches.
Test: atest -c CtsHostsideNetworkTests
Bug: 270006466
Merged-In: I8cb64d8bb86b781cd57d1a1a466c56185573fcc2
Change-Id: Icc475586d6f26d913b328647b94af1b53a3bb32d
diff --git a/tests/cts/hostside/Android.bp b/tests/cts/hostside/Android.bp
index 47ea53e..ff9bd31 100644
--- a/tests/cts/hostside/Android.bp
+++ b/tests/cts/hostside/Android.bp
@@ -12,6 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+next_app_data = [ ":CtsHostsideNetworkTestsAppNext" ]
+
+// The above line is put in place to prevent any future automerger merge conflict between aosp,
+// downstream branches. The CtsHostsideNetworkTestsAppNext target will not exist in
+// some downstream branches, but it should exist in aosp and some downstream branches.
+
+
+
+
+
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
@@ -37,7 +47,6 @@
data: [
":CtsHostsideNetworkTestsApp",
":CtsHostsideNetworkTestsApp2",
- ":CtsHostsideNetworkTestsAppNext",
- ],
+ ] + next_app_data,
per_testcase_directory: true,
}