summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-01-16 04:04:07 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-01-16 04:04:07 +0000
commitc9f7a1d6f51b4e9bf19764303deb7ed998a430e9 (patch)
tree39e98984145a753cdf6837647a0b034e6cd305e7
parent42ea4dc6d1fc2206a7778029070ed9213e3b0fbf (diff)
parent6f209a989ffe722153cb67d253371ab733054d0a (diff)
downloadxmp_toolkit-c9f7a1d6f51b4e9bf19764303deb7ed998a430e9.tar.gz
Snap for 5235151 from 6f209a989ffe722153cb67d253371ab733054d0a to qt-release
Change-Id: Idfbf2a1735cdee15ca5323ddfb9e2e48a1300dfa
-rw-r--r--Android.mk2
-rw-r--r--OWNERS3
-rw-r--r--XMPCore/Android.bp6
-rw-r--r--XMPCore/Android.mk13
4 files changed, 9 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/OWNERS b/OWNERS
new file mode 100644
index 0000000..bcc2005
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+# used by some apps
+include platform/packages/apps/Gallery2:/OWNERS
+include platform/packages/apps/Camera2:/OWNERS
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)