From 98cf2d73469fb6d9aee3f453d17169770983a57b Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 9 Apr 2018 18:31:24 -0700
Subject: Convert junit-params to Android.bp

See build/soong/README.md for more information.

Bug: 70770641
Test: m checkbuild
Test: vogar --classpath \
      ${ANDROID_PRODUCT_OUT}/obj/JAVA_LIBRARIES/junit-params-test_intermediates/javalib.jar \
      junitparams

Change-Id: Ib342a7625c0e06784942a0227c82268abbaaa5e1
---
 Android.bp |  63 ++++++++++++++++++++++++++++++++++
 Android.mk | 112 -------------------------------------------------------------
 2 files changed, 63 insertions(+), 112 deletions(-)
 create mode 100644 Android.bp
 delete mode 100644 Android.mk

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ffc0621
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,63 @@
+// Copyright (C) 2016 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.
+//
+//
+
+//-------------------------------
+// build a target jar
+
+java_library_static {
+    name: "junit-params",
+    host_supported: true,
+    hostdex: true,
+    srcs: ["src/main/java/**/*.java"],
+    no_framework_libs: true,
+    static_libs: ["junit"],
+}
+
+// compatibility host library with old name
+java_library_host {
+    name: "junit-params-host",
+    static_libs: ["junit-params"],
+}
+
+//-------------------------------
+// build test jars
+//
+// Run the target test jar as follows:
+//   vogar --classpath \
+//     ${ANDROID_PRODUCT_OUT}/obj/JAVA_LIBRARIES/junit-params-test_intermediates/javalib.jar \
+//     junitparams
+
+java_test {
+    name: "junit-params-test",
+    host_supported: true,
+    srcs: ["src/test/java/**/*.java"],
+    java_resource_dirs: ["src/test/resources"],
+    no_framework_libs: true,
+    static_libs: [
+        "junit-params",
+        "junit-params-assertj-core",
+    ],
+}
+
+//-------------------------------
+// prebuilt dependencies
+
+java_import {
+    name: "junit-params-assertj-core",
+    jars: ["lib/assertj-core-1.7.1.jar"],
+    host_supported: true,
+}
+
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 99545dc..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2016 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)
-
-# build for the host JVM
-#-----------------------
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_MODULE := junit-params-host
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	junit-host
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build for the host dalvik
-# -------------------------
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_MODULE := junit-params-hostdex
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	junit-hostdex
-include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
-
-#-------------------------------
-# build a target jar
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_MODULE := junit-params
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := core-oj core-libart
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	junit
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#-------------------------------
-# build a host test jar
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
-LOCAL_JAVA_RESOURCE_DIRS := src/test/resources
-LOCAL_MODULE := junit-params-test-host
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	junit-params-host \
-	junit-params-assertj-core-host
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-#-------------------------------
-# build a target test jar
-#
-# Run the test jar as follows:
-#   vogar --classpath \
-     ${ANDROID_PRODUCT_OUT}/obj/JAVA_LIBRARIES/junit-params-test_intermediates/classes.jack \
-     junitparams
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java)
-LOCAL_JAVA_RESOURCE_DIRS := src/test/resources
-LOCAL_MODULE := junit-params-test
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := core-oj core-libart junit
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	junit-params \
-	junit-params-assertj-core
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#-------------------------------
-# prebuilt dependencies
-
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    junit-params-assertj-core:lib/assertj-core-1.7.1.jar
-
-include $(BUILD_MULTI_PREBUILT)
-
-#-------------------------------
-# prebuilt dependencies
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_HOST_MODULE := true
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
-    junit-params-assertj-core-host:lib/assertj-core-1.7.1.jar
-
-include $(BUILD_MULTI_PREBUILT)
-- 
cgit v1.2.3