Convert Android.mk to Android.bp am: 0817256c4fandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3master-cuttlefish-testing-release

am: 21f07582f8

Change-Id: Ia75275d4a3040cdf39fba1bea0b1a7f6e51d7e92

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 :=