summaryrefslogtreecommitdiff
path: root/apct-tests/perftests/utils
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-02-12 09:38:16 -0800
committerSasha Smundak <asmundak@google.com>2019-02-19 13:46:51 -0800
commit500db62bfa834b191bc353596528127f69da4c39 (patch)
treed12bb1aaa116599aacfaefbf998868c7c63f5e75 /apct-tests/perftests/utils
parent5fe2936fcb67bd559fbdefa40b782c2c6eb7ebc7 (diff)
Convert Android.mk file to Android.bp
See build/soong/README.md for more information. Bug: 122332340 Test: treehugger Change-Id: I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8
Diffstat (limited to 'apct-tests/perftests/utils')
-rw-r--r--apct-tests/perftests/utils/Android.bp9
-rw-r--r--apct-tests/perftests/utils/Android.mk15
2 files changed, 9 insertions, 15 deletions
diff --git a/apct-tests/perftests/utils/Android.bp b/apct-tests/perftests/utils/Android.bp
new file mode 100644
index 000000000000..be85816629c1
--- /dev/null
+++ b/apct-tests/perftests/utils/Android.bp
@@ -0,0 +1,9 @@
+java_library {
+ name: "apct-perftests-utils",
+ static_libs: [
+ "androidx.test.rules",
+ "androidx.annotation_annotation",
+ ],
+ // Build all java files in the java subdirectory
+ srcs: ["**/*.java"],
+}
diff --git a/apct-tests/perftests/utils/Android.mk b/apct-tests/perftests/utils/Android.mk
deleted file mode 100644
index 19f83c8f5bb0..000000000000
--- a/apct-tests/perftests/utils/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx.test.rules \
- androidx.annotation_annotation
-
-# Build all java files in the java subdirectory
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-# The name of the jar file to create
-LOCAL_MODULE := apct-perftests-utils
-
-# Build a static jar file.
-include $(BUILD_STATIC_JAVA_LIBRARY) \ No newline at end of file