diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:50:34 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:50:34 -0700 |
| commit | b6005ef5734b9fe0c965e9b51545156159e536ac (patch) | |
| tree | f0320cab0181b9de05065195712b069f7fb33049 | |
| parent | 0737ddc95f0f2d8f6527689c34116bc89d0847d8 (diff) | |
| parent | 596c7d85571997598a86da24b8f07881d6bbf1c3 (diff) | |
| download | glide-b6005ef5734b9fe0c965e9b51545156159e536ac.tar.gz | |
Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3
Bug: 112104996
Change-Id: I4d936c46e75b21b0c0982b70a0b8e77f4b379d3e
| -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) |