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: Ic1e8fe76e8a297929c598abcdc6ca9fac35fe704
Change-Id: I9cf464c4313a827f15a063cc06c1e281032b8d7e
diff --git a/tests/cts/hostside/Android.bp b/tests/cts/hostside/Android.bp
index 5474d08..0f26702 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 = []
+
+// 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,6 +47,6 @@
data: [
":CtsHostsideNetworkTestsApp",
":CtsHostsideNetworkTestsApp2",
- ],
+ ] + next_app_data,
per_testcase_directory: true,
}