commit f6d6b7e7de32d9292242b78e837cde62be7632b7
author Ken Chen <cken@google.com> Fri Jul 29 01:55:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 29 01:55:30 2022 +0000
tree fb42921d5ee65fe947245dc82264912f3be8d5df
parent 0da1b4d4f253ecb8bd95e98ee008958a1bef97d4
parent ef50ab14734c0cc1ad11a299d3af910a268750b7

Merge "Move connectivity_native_test to a sub folder"

bpf_progs/Android.bp

diff --git a/bpf_progs/Android.bp b/bpf_progs/Android.bp
index c2e28f4..2f4cbcd 100644
--- a/bpf_progs/Android.bp
+++ b/bpf_progs/Android.bp
@@ -50,7 +50,7 @@
         "//packages/modules/Connectivity/service/native/libs/libclat",
         "//packages/modules/Connectivity/Tethering",
         "//packages/modules/Connectivity/service/native",
-        "//packages/modules/Connectivity/tests/native",
+        "//packages/modules/Connectivity/tests/native/connectivity_native_test",
         "//packages/modules/Connectivity/service-t/native/libs/libnetworkstats",
         "//packages/modules/Connectivity/tests/unit/jni",
         "//system/netd/tests",

tests/native/connectivity_native_test/Android.bp

diff --git a/tests/native/Android.bp b/tests/native/connectivity_native_test/Android.bp
similarity index 100%
rename from tests/native/Android.bp
rename to tests/native/connectivity_native_test/Android.bp

tests/native/connectivity_native_test/AndroidTestTemplate.xml

diff --git a/tests/native/AndroidTestTemplate.xml b/tests/native/connectivity_native_test/AndroidTestTemplate.xml
similarity index 100%
rename from tests/native/AndroidTestTemplate.xml
rename to tests/native/connectivity_native_test/AndroidTestTemplate.xml

tests/native/connectivity_native_test/NetNativeTestConfigTemplate.xml

diff --git a/tests/native/NetNativeTestConfigTemplate.xml b/tests/native/connectivity_native_test/NetNativeTestConfigTemplate.xml
similarity index 100%
rename from tests/native/NetNativeTestConfigTemplate.xml
rename to tests/native/connectivity_native_test/NetNativeTestConfigTemplate.xml

tests/native/connectivity_native_test/OWNERS

diff --git a/tests/native/OWNERS b/tests/native/connectivity_native_test/OWNERS
similarity index 100%
rename from tests/native/OWNERS
rename to tests/native/connectivity_native_test/OWNERS

tests/native/connectivity_native_test/connectivity_native_test.cpp

diff --git a/tests/native/connectivity_native_test.cpp b/tests/native/connectivity_native_test/connectivity_native_test.cpp
similarity index 100%
rename from tests/native/connectivity_native_test.cpp
rename to tests/native/connectivity_native_test/connectivity_native_test.cpp