release-request-148314be-b6e7-4b4d-b50e-ab6405ef3c8a-for-git_oc-dr1-release-3968906 snap-temp-L55700000060028590
Change-Id: Ibd69c151a479e01f9f85f0ec5088db4f2e3ddb8f
diff --git a/Android.mk b/Android.mk
index 8d43c85..a1d10ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,8 +33,7 @@
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 @@
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)))
