summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian DC <radian.dc@gmail.com>2018-01-16 22:07:53 +0100
committerJoey <joey@lineageos.org>2018-02-04 14:54:26 +0100
commit4eb4d15bcf081582eccc8b00842c105f7e8a00e0 (patch)
tree7f9207f08ddb588c6d1e237ccd8b7ad8becd50ae
parentfbc70a9c8f48acf701b8bb8fbca4180ce3e2ec2b (diff)
downloadandroid_packages_apps_Trebuchet-4eb4d15bcf081582eccc8b00842c105f7e8a00e0.tar.gz
android_packages_apps_Trebuchet-4eb4d15bcf081582eccc8b00842c105f7e8a00e0.tar.bz2
android_packages_apps_Trebuchet-4eb4d15bcf081582eccc8b00842c105f7e8a00e0.zip
Launcher3Go: Adapt build rules and manifest
* Follows previous commits: "Bump targetsdk to 27" "Bump minsdk to 23" "Trebuchet: quick settings & settings reorganization" Change-Id: Ided58300528647c1e7c2689b20365232d0d004b6
-rw-r--r--Android.mk6
-rw-r--r--go/AndroidManifest.xml2
2 files changed, 7 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index ed770c0af..b24f5b273 100644
--- a/Android.mk
+++ b/Android.mk
@@ -79,6 +79,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \
+ android-support-design \
+ android-support-v7-appcompat \
android-support-v7-recyclerview \
android-support-v7-palette \
android-support-dynamic-animation
@@ -93,6 +95,8 @@ LOCAL_SRC_FILES := \
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/go/res \
$(LOCAL_PATH)/res \
+ frameworks/support/design/res \
+ frameworks/support/v7/appcompat/res \
prebuilts/sdk/current/support/v7/recyclerview/res \
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
@@ -103,6 +107,8 @@ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
+ --extra-packages android.support.design \
+ --extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.recyclerview \
LOCAL_SDK_VERSION := current
diff --git a/go/AndroidManifest.xml b/go/AndroidManifest.xml
index ed8e0ad3b..5f1400b5a 100644
--- a/go/AndroidManifest.xml
+++ b/go/AndroidManifest.xml
@@ -22,7 +22,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.android.launcher3" >
- <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>
+ <uses-sdk android:targetSdkVersion="27" android:minSdkVersion="23"/>
<application
android:backupAgent="com.android.launcher3.LauncherBackupAgent"