diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-02 15:53:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-02 15:53:19 +0000 |
| commit | 2e6d5bbf101553d29a05067f9543be81fe7ab92c (patch) | |
| tree | 1688eef122b2e6f4cdf068de7985e3d89b1a6bb4 | |
| parent | 002ba29f89b9b8f8a6e6a0663565319a4fe26fbd (diff) | |
| parent | 9305871fc0013c451f33e56229507be0a1e120c6 (diff) | |
| download | LocalMediaPlayer-2e6d5bbf101553d29a05067f9543be81fe7ab92c.tar.gz | |
Use AAPT2 am: f5cc075f37
am: 9305871fc0
Change-Id: I2d6acbca04327c0d558675b57271ad1af1d57ece
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -33,8 +33,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ - frameworks/support/design/res +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := LocalMediaPlayer @@ -46,12 +45,15 @@ LOCAL_PRIVILEGED_MODULE := true include packages/apps/Car/libs/car-stream-ui-lib/car-stream-ui-lib.mk -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 \ - android-support-design \ +LOCAL_STATIC_JAVA_LIBRARIES += \ car-stream-lib \ LocalMediaPlayer-proto -LOCAL_AAPT_FLAGS += --extra-packages android.support.design +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-v4 \ + android-support-design + +LOCAL_USE_AAPT2 := true # Include support-v7-appcompat, if not already included ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES))) |