Convert one Make module to a Soong one
Converted the Make module `NeuralNetworksApiBenchmark_Lib` to a Soong
one, which is needed by other Soong modules.
Bug: 190637130
Test: compared the two jar files built by Make and Soong
Test: TreeHugger
Change-Id: Id9a400bf430dd0936841975bd5c56f22eedb02ef
Merged-In: Id9a400bf430dd0936841975bd5c56f22eedb02ef
diff --git a/Android.bp b/Android.bp
index 827ddfa..cf4e4c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,3 +29,15 @@
"LICENSE",
],
}
+
+java_library {
+ name: "NeuralNetworksApiBenchmark_Lib",
+ installable: true,
+ sdk_version: "28",
+ srcs: [
+ "src/com/android/nn/benchmark/core/**/*.java",
+ "src/com/android/nn/benchmark/evaluators/**/*.java",
+ "src/com/android/nn/benchmark/imageprocessors/**/*.java",
+ "src/com/android/nn/benchmark/util/**/*.java",
+ ],
+}
diff --git a/Android.mk b/Android.mk
index 996cdfb..f74fa77 100644
--- a/Android.mk
+++ b/Android.mk
@@ -67,17 +67,4 @@
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
include $(BUILD_PACKAGE)
-include $(CLEAR_VARS)
-LOCAL_SDK_VERSION := 28
-LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/nn/benchmark/core) \
- $(call all-java-files-under, src/com/android/nn/benchmark/evaluators) \
- $(call all-java-files-under, src/com/android/nn/benchmark/imageprocessors) \
- $(call all-java-files-under, src/com/android/nn/benchmark/util)
-LOCAL_JNI_SHARED_LIBRARIES := libnnbenchmark_jni
-LOCAL_MODULE := NeuralNetworksApiBenchmark_Lib
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
-include $(BUILD_JAVA_LIBRARY)
-
include $(call all-makefiles-under,$(LOCAL_PATH))
