diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-03-26 15:08:33 -0700 |
|---|---|---|
| committer | Sasha Smundak <asmundak@google.com> | 2019-03-26 15:18:41 -0700 |
| commit | b61bab6a583495f08233b27664849795f3511536 (patch) | |
| tree | 93bb884b82b110895570e0d7e4849d3678d9ade6 /keystore/tests | |
| parent | 78a39b46279ed26746e8e5504244dda338f424bf (diff) | |
Convert Android.mk file to Android.bp
Files failing automerge from AOSP.
See build/soong/README.md for more information.
Bug: 122332340
Test: treehugger
Change-Id: I92f7584aeaf502336f67e04fbc22634784c9305d
Diffstat (limited to 'keystore/tests')
| -rw-r--r-- | keystore/tests/Android.bp | 26 | ||||
| -rw-r--r-- | keystore/tests/Android.mk | 34 |
2 files changed, 26 insertions, 34 deletions
diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp new file mode 100644 index 000000000000..e9b22c140742 --- /dev/null +++ b/keystore/tests/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2017 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. + +android_test { + name: "KeystoreTests", + // LOCAL_MODULE := keystore + srcs: ["src/**/*.java"], + static_libs: [ + "androidx.test.rules", + "hamcrest-library", + ], + platform_apis: true, + libs: ["android.test.runner"], + certificate: "platform", +} diff --git a/keystore/tests/Android.mk b/keystore/tests/Android.mk deleted file mode 100644 index 99d3197f8bf3..000000000000 --- a/keystore/tests/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2017 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 := keystore -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.rules hamcrest-library - -LOCAL_PACKAGE_NAME := KeystoreTests -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_JAVA_LIBRARIES := android.test.runner - -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) - |