diff options
| author | Colin Cross <ccross@android.com> | 2018-08-17 09:22:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 09:22:41 -0700 |
| commit | 7db8291b28e7e3f3dbe4e4c23232b645025a0005 (patch) | |
| tree | e1ee3096d2a2be74a01865f7af6ee427017ad7c9 | |
| parent | da9a84e43e1710b4512825ef31bffd9d6b61df59 (diff) | |
| parent | 21291fd1763df8bfd13a420ec32c36af0fe8bb8c (diff) | |
| download | nist-pkits-7db8291b28e7e3f3dbe4e4c23232b645025a0005.tar.gz | |
Merge "Convert external/nist-pkits to Android.bp" am: 52f06974b0
am: 21291fd176
Change-Id: I1ab4b961db7d9da210da37bcc3c6201fed36843c
| -rw-r--r-- | Android.bp | 22 | ||||
| -rw-r--r-- | Android.mk | 32 |
2 files changed, 22 insertions, 32 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..55c1f28 --- /dev/null +++ b/Android.bp @@ -0,0 +1,22 @@ +// Copyright (C) 2013 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 { + name: "nist-pkix-tests", + hostdex: true, + srcs: ["src/**/*.java"], + java_resource_dirs: ["res"], + libs: ["junit"], + sdk_version: "core_current", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 42db122..0000000 --- a/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2013 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_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_RESOURCE_DIRS := res -LOCAL_MODULE := nist-pkix-tests -LOCAL_JAVA_LIBRARIES := junit -LOCAL_SDK_VERSION := core_current -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_RESOURCE_DIRS := res -LOCAL_MODULE := nist-pkix-tests-host -LOCAL_JAVA_LIBRARIES := junit-hostdex -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk -include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) |