commit ac60b59e3161366b2f956db3891beac7b321785b
author Joey <joey@lineageos.org> Tue Oct 02 17:09:53 2018 +0200
committer Alexander Martinz <amartinz@shiftphones.com> Tue Aug 20 21:34:56 2024 +0200
tree d67ef74e888377ab2e11e7f6b8390da1c77d6522
parent 4b681424632ab1593b75580f29ccf1ffaa72f46a

Trebuchet: update build configs

Change-Id: I072a85e068de4017c8d401785a89dc49296060cf
Signed-off-by: Joey <joey@lineageos.org>

Android.bp

diff --git a/Android.bp b/Android.bp
index 787c98b..534d717 100644
--- a/Android.bp
+++ b/Android.bp
@@ -185,7 +185,7 @@
 // Build rule for Launcher3 app.
 //
 android_app {
-    name: "Launcher3",
+    name: "Trebuchet",
 
     static_libs: [
         "Launcher3CommonDepsLib",
@@ -317,7 +317,7 @@
 
 // Build rule for Launcher3 Go app for Android Go devices.
 android_app {
-    name: "Launcher3Go",
+    name: "TrebuchetGo",
 
     static_libs: ["Launcher3CommonDepsLib"],
 
@@ -343,6 +343,7 @@
         "Launcher2",
         "Launcher3",
         "Launcher3QuickStep",
+        "Launcher3Go",
     ],
     required: ["privapp_whitelist_com.android.launcher3"],
 
@@ -360,7 +361,7 @@
 
 // Build rule for Quickstep app.
 android_app {
-    name: "Launcher3QuickStep",
+    name: "TrebuchetQuickStep",
 
     static_libs: ["Launcher3QuickStepLib"],
     optimize: {
@@ -377,6 +378,7 @@
         "Home",
         "Launcher2",
         "Launcher3",
+        "Launcher3QuickStep",
     ],
     required: ["privapp_whitelist_com.android.launcher3"],
 
@@ -396,7 +398,7 @@
 
 // Build rule for Launcher3 Go app with quickstep for Android Go devices.
 android_app {
-    name: "Launcher3QuickStepGo",
+    name: "TrebuchetQuickStepGo",
 
     static_libs: [
         "SystemUI-statsd",
@@ -428,6 +430,7 @@
         "Launcher2",
         "Launcher3",
         "Launcher3QuickStep",
+        "Launcher3QuickStepGo",
     ],
     required: ["privapp_whitelist_com.android.launcher3"],
 

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4f580e0..8db92ed 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,6 +19,7 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.android.launcher3">
     <uses-sdk android:targetSdkVersion="33" android:minSdkVersion="26"/>
     <!--
@@ -37,7 +38,8 @@
         android:theme="@style/AppTheme"
         android:largeHeap="@bool/config_largeHeap"
         android:restoreAnyVersion="true"
-        android:supportsRtl="true" >
+        android:supportsRtl="true"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <!--
         Main launcher activity. When extending only change the name, and keep all the

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index e7f4084..ecf0c7e 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -115,11 +115,11 @@
     ],
     use_embedded_native_libs: false,
     compile_multilib: "both",
-    instrumentation_for: "Launcher3",
+    instrumentation_for: "Trebuchet",
     manifest: "AndroidManifest.xml",
     platform_apis: true,
     test_config: "Launcher3Tests.xml",
-    data: [":Launcher3"],
+    data: [":Trebuchet"],
     test_suites: ["general-tests"],
 }