summaryrefslogtreecommitdiff
path: root/tools/preload
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-02-11 14:41:25 -0800
committerSasha Smundak <asmundak@google.com>2019-02-11 14:58:20 -0800
commit31754eb5df1f5a98638ce5c93b90c0814bf43b35 (patch)
treefcd66370633d5825517e64de2a6ae1d6df1c70bb /tools/preload
parent3b988d1782981ac2c0a491c022c00d90e1696622 (diff)
Convert Android.mk file to Android.bp
See build/soong/README.md for more information. Bug: 122332340 Test: treehugger Change-Id: I52416790e1e4493dd4fe57404095351b8d37ea22
Diffstat (limited to 'tools/preload')
-rw-r--r--tools/preload/Android.bp17
-rw-r--r--tools/preload/Android.mk23
-rw-r--r--tools/preload/loadclass/Android.bp4
-rw-r--r--tools/preload/loadclass/Android.mk9
4 files changed, 21 insertions, 32 deletions
diff --git a/tools/preload/Android.bp b/tools/preload/Android.bp
new file mode 100644
index 000000000000..809ee474969a
--- /dev/null
+++ b/tools/preload/Android.bp
@@ -0,0 +1,17 @@
+java_library_host {
+ name: "preload",
+ srcs: [
+ "Compile.java",
+ "LoadedClass.java",
+ "MemoryUsage.java",
+ "Operation.java",
+ "Policy.java",
+ "PrintCsv.java",
+ "PrintHtmlDiff.java",
+ "PrintPsTree.java",
+ "Proc.java",
+ "Record.java",
+ "Root.java",
+ "WritePreloadedClassFile.java",
+ ],
+}
diff --git a/tools/preload/Android.mk b/tools/preload/Android.mk
deleted file mode 100644
index 14a4547cccbf..000000000000
--- a/tools/preload/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- Compile.java \
- LoadedClass.java \
- MemoryUsage.java \
- Operation.java \
- Policy.java \
- PrintCsv.java \
- PrintHtmlDiff.java \
- PrintPsTree.java \
- Proc.java \
- Record.java \
- Root.java \
- WritePreloadedClassFile.java
-
-LOCAL_MODULE:= preload
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tools/preload/loadclass/Android.bp b/tools/preload/loadclass/Android.bp
new file mode 100644
index 000000000000..6f12015dae2b
--- /dev/null
+++ b/tools/preload/loadclass/Android.bp
@@ -0,0 +1,4 @@
+java_test {
+ name: "loadclass",
+ srcs: ["**/*.java"],
+}
diff --git a/tools/preload/loadclass/Android.mk b/tools/preload/loadclass/Android.mk
deleted file mode 100644
index 65828be617df..000000000000
--- a/tools/preload/loadclass/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_MODULE := loadclass
-
-include $(BUILD_JAVA_LIBRARY)