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

Commit c47f0eb0 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Update to use STATIC_ANDROID_LIBRARIES 

am: bfc5eb5e

Change-Id: I0c77f1b8c8ae5a224c5227513d2bdbb5f87b151d
parents eb2390f9 bfc5eb5e

Android.mk

+12 −29
Original line number Diff line number Diff line
@@ -3,15 +3,6 @@ include $(CLEAR_VARS) 


LOCAL_RESOURCE_DIR := packages/apps/DeskClock/res



LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/design/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/percent/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/transition/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v14/preference/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/preference/res

LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res



LOCAL_MODULE_TAGS := optional

LOCAL_SDK_VERSION := current
@@ -24,25 +15,17 @@ LOCAL_PROGUARD_FLAG_FILES := ../../../frameworks/support/design/proguard-rules.p 
LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/preference/proguard-rules.pro

LOCAL_PROGUARD_FLAG_FILES += ../../../frameworks/support/v7/recyclerview/proguard-rules.pro



LOCAL_STATIC_JAVA_LIBRARIES := android-support-design-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES += android-support-percent-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES += android-support-transition-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview-prebuilt



LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS += --extra-packages android.support.compat

LOCAL_AAPT_FLAGS += --extra-packages android.support.design

LOCAL_AAPT_FLAGS += --extra-packages android.support.percent

LOCAL_AAPT_FLAGS += --extra-packages android.support.transition

LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference

LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview

LOCAL_STATIC_ANDROID_LIBRARIES := \

        android-support-design \

        android-support-percent \

        android-support-transition \

        android-support-v13 \

        android-support-v14-preference \

        android-support-v7-appcompat \

        android-support-v7-gridlayout \

        android-support-v7-preference \

        android-support-v7-recyclerview



LOCAL_USE_AAPT2 := true



include $(BUILD_PACKAGE)