Convert ExactCalculator to AAPT2
Test: m ExactCalculator
Change-Id: I3f913d2c80a8b73c735398f3617824b4fab4d8ac
diff --git a/Android.mk b/Android.mk
index 5b92157..ab9ff51 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,15 +17,8 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_RESOURCE_DIR := packages/apps/ExactCalculator/res
-
-ifeq ($(TARGET_BUILD_APPS),)
-LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res
-LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
-else
-LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res
-LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res
-endif
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := optional
LOCAL_SDK_VERSION := current
@@ -36,15 +29,10 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguard-rules.pro
LOCAL_STATIC_JAVA_LIBRARIES := cr
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
-
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
+LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-gridlayout
+LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-recyclerview
include $(BUILD_PACKAGE)