diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-19 22:04:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-19 22:04:40 +0000 |
| commit | 14bf97acee60624d7f0b4e46a1fc5f5f6f5d477d (patch) | |
| tree | 7669e79f61881c580a3df96116af871ffee4812f /core/xsd | |
| parent | 923672971e4a3681578e88a85fa9441ed1344441 (diff) | |
| parent | 6fc5f5e76e991865e14d80eaf6d1c3d290e1f5be (diff) | |
Merge "Convert core/xsd/vts/Android.mk file to Android.bp" am: 682de55962 am: 6fc5f5e76e
Change-Id: I14ba372c317fdde507132ece1bf02808fb986528
Diffstat (limited to 'core/xsd')
| -rw-r--r-- | core/xsd/vts/Android.bp | 4 | ||||
| -rw-r--r-- | core/xsd/vts/Android.mk | 22 |
2 files changed, 4 insertions, 22 deletions
diff --git a/core/xsd/vts/Android.bp b/core/xsd/vts/Android.bp index ca655f18149c..4b43b4136076 100644 --- a/core/xsd/vts/Android.bp +++ b/core/xsd/vts/Android.bp @@ -40,3 +40,7 @@ cc_test { ], test_config: "vts_permission_validate_test.xml", } + +vts_config { + name: "VtsValidatePermission", +} diff --git a/core/xsd/vts/Android.mk b/core/xsd/vts/Android.mk deleted file mode 100644 index a5754a494d94..000000000000 --- a/core/xsd/vts/Android.mk +++ /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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := VtsValidatePermission -include test/vts/tools/build/Android.host_config.mk |