Snap for 5235151 from 7ef7f5f5aa7bb7d4f21b5180873c735bdc88e8e7 to qt-release
Change-Id: I6da0f1f2e7c50e99ad7c7959837aedf6f5304e93
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..1396320
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,19 @@
+android_library {
+ name: "glide",
+ srcs: [
+ "library/src/**/*.java",
+ "third_party/disklrucache/src/**/*.java",
+ "third_party/gif_decoder/src/**/*.java",
+ "third_party/gif_encoder/src/**/*.java",
+ ],
+ manifest: "library/src/main/AndroidManifest.xml",
+ libs: [
+ "android-support-core-ui",
+ "android-support-compat",
+ "volley",
+ ],
+ static_libs: [
+ "android-support-fragment",
+ ],
+ sdk_version: "current",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index d71ae32..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH := $(my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, library/src)
-LOCAL_SRC_FILES += $(call all-java-files-under, third_party/disklrucache/src)
-LOCAL_SRC_FILES += $(call all-java-files-under, third_party/gif_decoder/src)
-LOCAL_SRC_FILES += $(call all-java-files-under, third_party/gif_encoder/src)
-LOCAL_MANIFEST_FILE := library/src/main/AndroidManifest.xml
-
-LOCAL_JAVA_LIBRARIES := volley
-
-LOCAL_SHARED_ANDROID_LIBRARIES := \
- android-support-fragment \
- android-support-core-ui \
- android-support-compat
-
-LOCAL_MODULE := glide
-LOCAL_MODULE_TAGS := optional
-LOCAL_USE_AAPT2 := true
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..e3c4727
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+# used by Camera2 app
+include platform/packages/apps/Camera2:/OWNERS
