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

Commit acdcb3f1 authored Dec 06, 2017 by Aurimas Liutikas Committed by Colin Cross May 03, 2018

Migrate Telecom to aapt2.

Test: make -j
Change-Id: I5306d72b2b37ed97b25edde4d032ef194be2df4f
Merged-In: I5306d72b2b37ed97b25edde4d032ef194be2df4f
(cherry picked from commit 2c40ffc6)

parent 64d3a4e2

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ LOCAL_JAVA_LIBRARIES := telephony-common

		LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-under, proto)
		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
		LOCAL_USE_AAPT2 := true

		LOCAL_PROTOC_OPTIMIZE_TYPE := nano
		LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/proto/

tests/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ LOCAL_JAVA_LIBRARIES := \
		android.test.runner \
		telephony-common

		LOCAL_USE_AAPT2 := true

		LOCAL_AAPT_FLAGS := \
		--auto-add-overlay \
		--extra-packages com.android.server.telecom:android.support.compat