diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-11-17 13:46:16 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-04-25 15:29:08 -0700 |
| commit | 232eb2eca41c9da72f2073a90405e09db2e60e9f (patch) | |
| tree | 8deb2fecb6a43e218e72684cf171c0bea1506c71 | |
| parent | 78475cdcf69dd10b9a3579c465e103850a2216e2 (diff) | |
| download | ExactCalculator-232eb2eca41c9da72f2073a90405e09db2e60e9f.tar.gz | |
Convert ExactCalculator to AAPT2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1
Test: m ExactCalculator
Change-Id: I3f913d2c80a8b73c735398f3617824b4fab4d8ac
Merged-In: I3f913d2c80a8b73c735398f3617824b4fab4d8ac
(cherry picked from commit c611158092b477bcf1ed40b136ba5e3cf253dc95)
| -rw-r--r-- | Android.mk | 22 |
1 files changed, 5 insertions, 17 deletions
@@ -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_OVERRIDES_PACKAGES := Calculator 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) |