diff options
| author | Kirill Grouchnikov <kirillg@google.com> | 2017-05-16 01:33:57 +0000 |
|---|---|---|
| committer | Kirill Grouchnikov <kirillg@google.com> | 2017-05-16 01:33:57 +0000 |
| commit | f83660d1e16cf1d535e2bee596bfcb9ccb8b8a66 (patch) | |
| tree | 4450c7f2453640c90c260f8907aef8e0452a3aaa | |
| parent | 022e0872094c2852f2d657a76c6eb0c39431ae7b (diff) | |
| download | LensPicker-oreo-vts-release.tar.gz | |
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 022e0872094c2852f2d657a76c6eb0c39431ae7b.
Bug: 30240339
Change-Id: I7b8579f4ca45240ac2bfca6576ec9b3392e7fd16
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -21,8 +21,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-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 := CarLensPickerApp @@ -38,7 +37,7 @@ LOCAL_AAPT_FLAGS += --extra-packages android.support.design # 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 |