commit 0ceb4fec5a71102b713b9dd949cba6bb09f97813
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 30 05:34:33 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 30 05:34:33 2019 +0000
tree 622e13ac82f9411702cbd5e10d8911ed5b36bab4
parent d66140d5a18b35eb996c719621326b6aa84dc949
parent 8b4da0ac2f24d76c8f28746104498e1052c7a0d9

Merge "[vts-core] Remove extra folder for vts_gsi_boot_test"

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 482efca..e162dfb 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -14,11 +14,6 @@
 // limitations under the License.
 //
 
-filegroup {
-    name: "boot_tests_cpp",
-    srcs: [ "boot_tests.cpp" ],
-}
-
 cc_defaults {
     name: "gsi_boot_defaults",
     shared_libs: [
@@ -35,7 +30,7 @@
         "android.hardware.weaver@1.0",
     ],
     srcs: [
-        ":boot_tests_cpp",
+        "boot_tests.cpp",
     ],
 }
 
@@ -44,6 +39,14 @@
     defaults: ["gsi_boot_defaults"],
 }
 
+cc_test {
+    name: "vts_gsi_boot_test",
+    defaults: ["gsi_boot_defaults"],
+    test_suites: ["vts-core"],
+    auto_gen_config: true,
+    test_min_api_level: 29,
+}
+
 java_test_host {
     name: "DSUEndtoEndTest",
     srcs: ["DSUEndtoEndTest.java"],

tests/vts_core/Android.bp

diff --git a/tests/vts_core/Android.bp b/tests/vts_core/Android.bp
deleted file mode 100644
index ef6e626..0000000
--- a/tests/vts_core/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright (C) 2019 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.
-//
-
-cc_test {
-    name: "vts_gsi_boot_test",
-    defaults: ["gsi_boot_defaults"],
-    test_suites: ["vts-core"],
-    test_min_api_level: 29,
-}