diff options
| author | Jiyong Park <jiyong@google.com> | 2018-03-09 00:52:23 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-03-09 11:52:07 +0900 |
| commit | 0817256c4f6bdee8715a5706fe75ecf8249e3648 (patch) | |
| tree | 1d4dcf4f00a2a5f928741777decf719e8d2635e3 | |
| parent | 215e8a509a678db0c21921018e5efec728cc2e14 (diff) | |
| download | wycheproof-o-mr1-iot-preview-8.tar.gz | |
Convert Android.mk to Android.bpandroid-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8o-mr1-iot-preview-8
Test: m -j checkbuild
Change-Id: I549f8ebaaa1a62ad20c0c07b38d318cae106bca1
| -rw-r--r-- | Android.bp | 30 | ||||
| -rw-r--r-- | Android.mk | 29 |
2 files changed, 30 insertions, 29 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..babf083 --- /dev/null +++ b/Android.bp @@ -0,0 +1,30 @@ +// +// 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. +// + +java_library_static { + name: "wycheproof", + srcs: ["java/**/*.java"], + exclude_srcs: [ + "java/com/google/security/wycheproof/SpongyCastleTest.java", + "java/com/google/security/wycheproof/SpongyCastleAllTests.java", + ], + no_framework_libs: true, + libs: [ + "conscrypt", + "bouncycastle", + "junit", + ], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 144d8b3..0000000 --- a/Android.mk +++ /dev/null @@ -1,29 +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) - -all_wycheproof_files := $(call all-java-files-under,java) -supported_wycheproof_files := $(filter-out %SpongyCastleTest.java %SpongyCastleAllTests.java,$(all_wycheproof_files)) - -include $(CLEAR_VARS) -LOCAL_MODULE := wycheproof -LOCAL_MODULE_TAGS := optional -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_SRC_FILES := $(supported_wycheproof_files) -LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt bouncycastle junit -include $(BUILD_STATIC_JAVA_LIBRARY) - -all_wycheproof_files := |