Migrate select Car service targets to aapt2
Test: None
Change-Id: Icbd11a677a668b39b04eb8e03d5986078acefb31
diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk
index 37c79f7..2159fa3 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -23,12 +23,13 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_USE_AAPT2 := true
+
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := EmbeddedKitchenSinkApp
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-
LOCAL_MODULE_TAGS := optional
LOCAL_PRIVILEGED_MODULE := true
@@ -39,11 +40,13 @@
LOCAL_DEX_PREOPT := false
+LOCAL_STATIC_ANDROID_LIBRARIES += \
+ car-service-lib-for-test
+
LOCAL_STATIC_JAVA_LIBRARIES += \
- android.hidl.base-V1.0-java \
- android.hardware.automotive.vehicle-V2.0-java \
- vehicle-hal-support-lib \
- car-service-lib-for-test \
+ android.hidl.base-V1.0-java \
+ android.hardware.automotive.vehicle-V2.0-java \
+ vehicle-hal-support-lib
LOCAL_JAVA_LIBRARIES += android.car