Merge branch 'ub-launcher3-edmonton' into pi-dev
Bug: 80134723
Test: manual
Change-Id: If8e9c1b1aacf547ab7a1edaccaa9fed5e976a980
diff --git a/Android.mk b/Android.mk
index ab445ac..a63ab05 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,7 +36,14 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-v4 \
+ android-support-annotations
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-compat \
+ android-support-media-compat \
+ android-support-core-utils \
+ android-support-core-ui \
+ android-support-fragment \
android-support-v7-recyclerview \
android-support-dynamic-animation
@@ -47,9 +54,8 @@
$(call all-proto-files-under, protos) \
$(call all-proto-files-under, proto_overrides)
-LOCAL_RESOURCE_DIR := \
- $(LOCAL_PATH)/res \
- prebuilts/sdk/current/support/v7/recyclerview/res \
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
@@ -57,9 +63,7 @@
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
-LOCAL_AAPT_FLAGS := \
- --auto-add-overlay \
- --extra-packages android.support.v7.recyclerview \
+LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 21
@@ -81,7 +85,14 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-v4 \
+ android-support-annotations
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-compat \
+ android-support-media-compat \
+ android-support-core-utils \
+ android-support-core-ui \
+ android-support-fragment \
android-support-v7-recyclerview \
android-support-dynamic-animation
@@ -95,7 +106,6 @@
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/go/res \
$(LOCAL_PATH)/res \
- prebuilts/sdk/current/support/v7/recyclerview/res \
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
@@ -103,9 +113,7 @@
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
-LOCAL_AAPT_FLAGS := \
- --auto-add-overlay \
- --extra-packages android.support.v7.recyclerview \
+LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 21
@@ -131,11 +139,18 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-v4 \
- android-support-v7-recyclerview \
- android-support-dynamic-animation \
+ android-support-annotations \
libSharedSystemUI
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-compat \
+ android-support-media-compat \
+ android-support-core-utils \
+ android-support-core-ui \
+ android-support-fragment \
+ android-support-v7-recyclerview \
+ android-support-dynamic-animation
+
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-java-files-under, quickstep/src) \
@@ -146,7 +161,6 @@
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/quickstep/res \
$(LOCAL_PATH)/res \
- prebuilts/sdk/current/support/v7/recyclerview/res \
LOCAL_PROGUARD_ENABLED := disabled
@@ -154,9 +168,7 @@
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
-LOCAL_AAPT_FLAGS := \
- --auto-add-overlay \
- --extra-packages android.support.v7.recyclerview \
+LOCAL_USE_AAPT2 := true
LOCAL_SDK_VERSION := system_current
LOCAL_MIN_SDK_VERSION := 26
