diff options
| author | Xin Li <delphij@google.com> | 2018-06-08 11:07:09 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-06-08 11:07:09 -0700 |
| commit | c7e3b6269b24b2fe2328cacf30b24956d275f1f9 (patch) | |
| tree | 1d71b55bb5b8cd415cafd47249e6331d7a2e0f18 | |
| parent | 8f5ebd9c32b74d76e9f2ec5abf02ad37ef100438 (diff) | |
| parent | 0c6e48e05c47f08735530d78b49ca158d4e38263 (diff) | |
| download | glide-c7e3b6269b24b2fe2328cacf30b24956d275f1f9.tar.gz | |
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: Ibce3628baa7d6b322d9224f6f4bac68e4fe9bfbb
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -7,12 +7,17 @@ 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_STATIC_JAVA_LIBRARIES := volley -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 +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_SDK_VERSION := 19 +LOCAL_USE_AAPT2 := true +LOCAL_SDK_VERSION := current include $(BUILD_STATIC_JAVA_LIBRARY) |