Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5870be0 authored by Alan Viverette's avatar Alan Viverette
Browse files

Use AAPT2 

Test: make Dialer
Change-Id: I9356a683416c2046bc206d5c5cfe83859698f4e8
parent 6640e55e

Android.mk

+11 −12
Original line number Diff line number Diff line
@@ -156,14 +156,11 @@ LOCAL_RESOURCE_DIR := \ 
	$(support_library_root_dir)/v7/cardview/res \

	$(support_library_root_dir)/v7/recyclerview/res



LOCAL_USE_AAPT2 := true



# We specify each package explicitly to glob resource files.

LOCAL_AAPT_FLAGS := \

	--auto-add-overlay \

	--extra-packages android.support.design \

	--extra-packages android.support.transition \

	--extra-packages android.support.v7.appcompat \

	--extra-packages android.support.v7.cardview \

	--extra-packages android.support.v7.recyclerview \

	--extra-packages com.android.contacts.common \

	--extra-packages com.android.dialer.app \

	--extra-packages com.android.dialer.app.voicemail.error \
@@ -216,13 +213,6 @@ LOCAL_AAPT_FLAGS := \ 


LOCAL_STATIC_JAVA_LIBRARIES := \

	android-common \

	android-support-design \

	android-support-transition \

	android-support-v13 \

	android-support-v4 \

	android-support-v7-appcompat \

	android-support-v7-cardview \

	android-support-v7-recyclerview \

	com.android.vcard \

	dialer-commons-io-target \

	dialer-dagger2-target \
@@ -238,6 +228,15 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	libprotobuf-java-nano \

	volley \



LOCAL_STATIC_ANDROID_LIBRARIES := \

	android-support-design \

	android-support-transition \

	android-support-v13 \

	android-support-v4 \

	android-support-v7-appcompat \

	android-support-v7-cardview \

	android-support-v7-recyclerview \



LOCAL_JAVA_LIBRARIES := \

	org.apache.http.legacy \

	dialer-auto-value \