diff options
| author | Kirill Grouchnikov <kirillg@google.com> | 2017-05-16 01:33:30 +0000 |
|---|---|---|
| committer | Kirill Grouchnikov <kirillg@google.com> | 2017-05-16 01:33:30 +0000 |
| commit | 4040c232031cf7825ca32cb7b0e756c21fa01d7e (patch) | |
| tree | d99cc3c21bffb96eac44bb3d72c69ea88d49abae | |
| parent | 9cca1b2a1f2e380055dfd0c8bf0e575ddefcd2f7 (diff) | |
| download | platform_packages_apps_Car_Radio-oreo-dev.tar.gz platform_packages_apps_Car_Radio-oreo-dev.tar.bz2 platform_packages_apps_Car_Radio-oreo-dev.zip | |
Revert "Tweak app makefile with extra resources"android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1oreo-vts-releaseoreo-dev
This reverts commit 9cca1b2a1f2e380055dfd0c8bf0e575ddefcd2f7.
Bug: 30240339
Change-Id: I13cfc28d97f4eb27ea432c57f8b3b9075c3b8edd
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -22,8 +22,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-unde LOCAL_AIDL_INCLUDES := $(call all-Iaidl-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/core-ui/res -LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/design/res +LOCAL_RESOURCE_DIR += frameworks/support/design/res LOCAL_PACKAGE_NAME := CarRadioApp @@ -40,13 +39,12 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-design LOCAL_STATIC_JAVA_LIBRARIES += car-stream-lib LOCAL_STATIC_JAVA_LIBRARIES += car-radio-service -LOCAL_AAPT_FLAGS += --extra-packages android.support.coreui LOCAL_AAPT_FLAGS += --extra-packages android.support.design LOCAL_AAPT_FLAGS += --extra-packages com.android.car.radio.service # Include support-v7-appcompat, if not already included ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res +LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat endif |