diff options
| author | Anthony Chen <ajchen@google.com> | 2018-05-01 14:21:10 -0700 |
|---|---|---|
| committer | Anthony Chen <ajchen@google.com> | 2018-05-01 14:52:53 -0700 |
| commit | edd989d065d5325cb4b564e6fd2e828376ac444b (patch) | |
| tree | 60f23bc09cf289ed662d96b988a208acd623526f | |
| parent | e9e7d638c33aa4ee2afda0ae9ee613d512586660 (diff) | |
| download | Messenger-edd989d065d5325cb4b564e6fd2e828376ac444b.tar.gz | |
DO NOT MERGE Clean dependencies after car-apps-common cleaning.
car-apps-common no longer depends on any support library targets. As a
result, Messenger needs to specify these deps explicitly. While doing
so, clean up and add the right deps.
Also, migrate to androidx namespace by using LOCAL_JEIFIER_ENABLED on
the prebuilt libraries.
Bug: 78886311
Test: build and deploy Messenger
Change-Id: I4629c373b47e6f474558d74b2dd7c7c89e956066
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -39,12 +39,14 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_USE_AAPT2 := true LOCAL_STATIC_ANDROID_LIBRARIES += \ - androidx.legacy_legacy-support-v4 \ + androidx.car_car \ car-apps-common -LOCAL_STATIC_JAVA_LIBRARIES += car-messenger-glide-target -LOCAL_STATIC_JAVA_LIBRARIES += car-massenger-gifdecoder-target -LOCAL_STATIC_JAVA_LIBRARIES += car-messenger-disklrucache-target +LOCAL_STATIC_JAVA_LIBRARIES += \ + androidx.annotation_annotation \ + car-messenger-glide-target \ + car-massenger-gifdecoder-target \ + car-messenger-disklrucache-target LOCAL_DEX_PREOPT := false @@ -56,6 +58,7 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE := car-messenger-disklrucache-target LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := ../../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT$(COMMON_JAVA_PACKAGE_SUFFIX) +LOCAL_JETIFIER_ENABLED := true LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_PREBUILT) @@ -66,6 +69,7 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE := car-massenger-gifdecoder-target LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := ../../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT$(COMMON_JAVA_PACKAGE_SUFFIX) +LOCAL_JETIFIER_ENABLED := true LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_PREBUILT) @@ -76,6 +80,7 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE := car-messenger-glide-target LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := ../../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT$(COMMON_JAVA_PACKAGE_SUFFIX) +LOCAL_JETIFIER_ENABLED := true LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_PREBUILT) |