diff options
author | nelsonli <nelsonli@google.com> | 2019-09-27 14:24:44 +0800 |
---|---|---|
committer | nelsonli <nelsonli@google.com> | 2019-09-27 14:24:44 +0800 |
commit | 8b4da0ac2f24d76c8f28746104498e1052c7a0d9 (patch) | |
tree | 9cbf8be580ea2082983cb8b3144a743179d444ed /tests | |
parent | 29eb46ca1d6442af2d181a16e67872741bf6f827 (diff) | |
download | gsid-8b4da0ac2f24d76c8f28746104498e1052c7a0d9.tar.gz |
[vts-core] Remove extra folder for vts_gsi_boot_test
Remove the extra folder of vts_core for vts_gsi_boot_test since
we submitted a better auto-gen option of auto_gen_config.
Bug: 141684102
Test: 1. m -j vts_gsi_boot_test
2. check out/..../vts_gsi_boot_test.config
Change-Id: Ib713bd9f10cfacd821ee66c3274f2961da6d5166
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Android.bp | 15 | ||||
-rw-r--r-- | tests/vts_core/Android.bp | 22 |
2 files changed, 9 insertions, 28 deletions
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 @@ cc_defaults { "android.hardware.weaver@1.0", ], srcs: [ - ":boot_tests_cpp", + "boot_tests.cpp", ], } @@ -44,6 +39,14 @@ cc_test { 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"], 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, -} |