diff options
| author | Colin Cross <ccross@android.com> | 2018-04-26 10:36:35 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-04-26 10:52:15 -0700 |
| commit | f6dd2990e8d078c329a2fb7de2a0d4e5180ccc92 (patch) | |
| tree | beeed6566ef9c5de8a45f8aef8f6e544e64a393d | |
| parent | 0af16e0a196a9253d305bd56a5fbfad58ff72f74 (diff) | |
| download | platform_packages_apps_Car_Stream-f6dd2990e8d078c329a2fb7de2a0d4e5180ccc92.tar.gz platform_packages_apps_Car_Stream-f6dd2990e8d078c329a2fb7de2a0d4e5180ccc92.tar.bz2 platform_packages_apps_Car_Stream-f6dd2990e8d078c329a2fb7de2a0d4e5180ccc92.zip | |
Migrate packages/apps/Car to aapt2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1
Test: None
Change-Id: Ied48afae7c54bdb74f97ca7db64fd8ecb16ab441
Merged-In: I729c2a59206950fdfc1d2bda07fc3803bd1db224
| -rw-r--r-- | Android.mk | 23 |
1 files changed, 10 insertions, 13 deletions
@@ -26,14 +26,14 @@ include packages/apps/Car/libs/car-apps-common/car-apps-common.mk include packages/services/Car/car-support-lib/car-support.mk -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 -LOCAL_STATIC_JAVA_LIBRARIES += car-stream-lib +LOCAL_USE_AAPT2 := true -LOCAL_AAPT_FLAGS += \ - --auto-add-overlay \ +LOCAL_STATIC_ANDROID_LIBRARIES += \ + android-support-v4 \ + car-radio-service -LOCAL_AAPT_FLAGS += --extra-packages com.android.car.radio.service -LOCAL_STATIC_JAVA_LIBRARIES += car-radio-service +LOCAL_STATIC_JAVA_LIBRARIES += \ + car-stream-lib LOCAL_PACKAGE_NAME := Stream LOCAL_PRIVATE_PLATFORM_APIS := true @@ -48,16 +48,13 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false # Include support-v7-cardview, if not already included -ifeq (,$(findstring android-support-v7-cardview,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/cardview/res -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.cardview -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-cardview +ifeq (,$(findstring android-support-v7-cardview,$(LOCAL_STATIC_ANDROID_LIBRARIES))) +LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-cardview endif # Include support-v7-palette, if not already included -ifeq (,$(findstring android-support-v7-palette,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.palette -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-palette +ifeq (,$(findstring android-support-v7-palette,$(LOCAL_STATIC_ANDROID_LIBRARIES))) +LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-palette endif # Include android-support-annotations, if not already included |