commit b7ea931aeec12fde2666c307585b70dc2ced94fc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 24 01:00:50 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 24 01:00:50 2025 -0800
tree 1c8a1cfee67291e4429307a5e3858e26ea3c4102
parent 666c922acd095feb9a1d4b93a7f2d765feff80cf
parent e239718b4e4e237f9761725e50e0d6d4c7312ebf

Merge "Revert "Replace system_ext container with system"" into main am: e239718b4e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/3464481

Change-Id: I38d87ad0be0b41c47d12f6e78e6047048e2d9392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

aconfig/Android.bp

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 5413601..bca7494 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -20,7 +20,7 @@
 aconfig_declarations {
     name: "com_android_launcher3_flags",
     package: "com.android.launcher3",
-    container: "system",
+    container: "system_ext",
     srcs: ["**/*.aconfig"],
 }
 

aconfig/launcher.aconfig

diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig
index 4d6c7ab..4d78c33 100644
--- a/aconfig/launcher.aconfig
+++ b/aconfig/launcher.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "enable_expanding_pause_work_button"

aconfig/launcher_overview.aconfig

diff --git a/aconfig/launcher_overview.aconfig b/aconfig/launcher_overview.aconfig
index 853faf8..23733a4 100644
--- a/aconfig/launcher_overview.aconfig
+++ b/aconfig/launcher_overview.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "enable_grid_only_overview"

aconfig/launcher_search.aconfig

diff --git a/aconfig/launcher_search.aconfig b/aconfig/launcher_search.aconfig
index 72f654e..b98eee6 100644
--- a/aconfig/launcher_search.aconfig
+++ b/aconfig/launcher_search.aconfig
@@ -1,5 +1,5 @@
 package: "com.android.launcher3"
-container: "system"
+container: "system_ext"
 
 flag {
     name: "enable_private_space"