Move SdkExtension tests into their own subdir am: 0a45a9c212

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/apex/+/11686954

Change-Id: I72ad8ef2d218f070d390c74cbc4236df1fbd98f5

4 files changed, 27 insertions, 13 deletions

diff --git a/tests/Android.bp b/tests/Android.bp
index 9edfb7d4..96fd30b4 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -149,18 +149,6 @@ java_test_host {
 }
 
 java_test_host {
-    name: "sdkextensions_e2e_tests",
-    srcs:  ["src/**/SdkExtensionsHostTest.java"],
-    libs: ["tradefed"],
-    static_libs: ["apex_e2e_base_test"],
-    data: [
-        ":test_com.android.sdkext",
-    ],
-    test_config: "sdkextensions-e2e-tests.xml",
-    test_suites: ["device-tests"],
-}
-
-java_test_host {
     name: "wifi_e2e_tests",
     srcs:  ["src/**/WifiHostTest.java"],
     defaults: ["apex_e2e_test_defaults"],
diff --git a/tests/sdkextensions/Android.bp b/tests/sdkextensions/Android.bp
new file mode 100644
index 00000000..081233ce
--- /dev/null
+++ b/tests/sdkextensions/Android.bp
@@ -0,0 +1,25 @@
+// Copyright (C) 2020 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+java_test_host {
+    name: "sdkextensions_e2e_tests",
+    srcs:  ["test-src/**/*.java"],
+    libs: ["tradefed"],
+    static_libs: ["apex_e2e_base_test"],
+    data: [
+        ":test_com.android.sdkext",
+    ],
+    test_config: "sdkextensions-e2e-tests.xml",
+    test_suites: ["device-tests"],
+}
diff --git a/tests/sdkextensions-e2e-tests.xml b/tests/sdkextensions/sdkextensions-e2e-tests.xml
index 77877730..77877730 100644
--- a/tests/sdkextensions-e2e-tests.xml
+++ b/tests/sdkextensions/sdkextensions-e2e-tests.xml
diff --git a/tests/src/com/android/tests/apex/SdkExtensionsHostTest.java b/tests/sdkextensions/test-src/com/android/tests/apex/sdkextensions/SdkExtensionsHostTest.java
index c55372d2..f576367d 100644
--- a/tests/src/com/android/tests/apex/SdkExtensionsHostTest.java
+++ b/tests/sdkextensions/test-src/com/android/tests/apex/sdkextensions/SdkExtensionsHostTest.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.tests.apex;
+package com.android.tests.apex.sdkextensions;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.android.tests.apex.ApexE2EBaseHostTest;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.IManagedTestDevice;
 import com.android.tradefed.log.LogUtil.CLog;