summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-15 01:09:59 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-15 01:09:59 -0800
commit5bdef0eb24b2536f102fd37e3beb4570c587827e (patch)
tree6ffd29de522b26b5e678ac9e4784d85896ea08ea
parent42ea4dc6d1fc2206a7778029070ed9213e3b0fbf (diff)
parent9d9163f90c996362a5ae158b3b3044e6186d460b (diff)
downloadxmp_toolkit-5bdef0eb24b2536f102fd37e3beb4570c587827e.tar.gz
Merge "Convert Android.mk file to Android.bp"
am: 9d9163f90c Change-Id: If8ba2cfee6308a3d536adbb6f10dabc77abefaa3
-rw-r--r--Android.mk2
-rw-r--r--XMPCore/Android.bp6
-rw-r--r--XMPCore/Android.mk13
3 files changed, 6 insertions, 15 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 3cc93fb..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Include the makefiles under this directory.
-include $(call all-makefiles-under,$(call my-dir))
diff --git a/XMPCore/Android.bp b/XMPCore/Android.bp
new file mode 100644
index 0000000..449826f
--- /dev/null
+++ b/XMPCore/Android.bp
@@ -0,0 +1,6 @@
+java_library {
+ name: "xmp_toolkit",
+ // Include all the java files.
+ srcs: ["src/**/*.java"],
+ sdk_version: "8",
+}
diff --git a/XMPCore/Android.mk b/XMPCore/Android.mk
deleted file mode 100644
index 955d296..0000000
--- a/XMPCore/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# Include all the java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_SDK_VERSION := 8
-
-# The name of the jar file to create.
-LOCAL_MODULE := xmp_toolkit
-
-# Build a static jar file.
-include $(BUILD_STATIC_JAVA_LIBRARY)