diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-01-15 11:13:21 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-15 11:13:21 -0800 |
| commit | 6fff775cd703dd987b27ff3a06f187fc2cfd232d (patch) | |
| tree | fad50f95c4f980ecbd89cb40ebc961b05117d1cb | |
| parent | 2f241ed7399c7b96437c85e929eb373ded8fccbd (diff) | |
| parent | bf7df9e44518de8d60dc348e4926942bdb7668a4 (diff) | |
| download | glide-6fff775cd703dd987b27ff3a06f187fc2cfd232d.tar.gz | |
Merge "Convert Android.mk to Android.bp." am: b0b6ab038c am: c68c18b32a
am: bf7df9e445
Change-Id: I4395d76649185c5561ee5fa74f49028c7e6f9ae4
| -rw-r--r-- | Android.bp | 19 | ||||
| -rw-r--r-- | Android.mk | 24 |
2 files changed, 19 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 00000000..13963205 --- /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 d71ae327..00000000 --- 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) |