summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorOriol Prieto Gasco <opg@google.com>2024-04-30 20:05:05 +0000
committerOriol Prieto Gascó <opg@google.com>2024-05-03 11:42:54 +0000
commit7b816129bafb07d7a1524f2cb375fb4c6af68eb0 (patch)
tree48fce6c811e201bea54ff6532eb52c3157691d6f /libs
parentca3da5d19c2bf7529b289b3e1da3ed45a7db657e (diff)
downloadbase-7b816129bafb07d7a1524f2cb375fb4c6af68eb0.tar.gz
RESTRICT AUTOMERGE
Set the container field of aconfig flags Test: printflags --format='{package}:{container}:' | grep "::" Bug: 312769710 Flag: NONE Change-Id: I84fda0d5e9813940609436d825738ff786908ff0
Diffstat (limited to 'libs')
-rw-r--r--libs/WindowManager/Shell/aconfig/Android.bp3
-rw-r--r--libs/WindowManager/Shell/aconfig/multitasking.aconfig1
-rw-r--r--libs/hwui/Android.bp1
-rw-r--r--libs/hwui/aconfig/hwui_flags.aconfig1
4 files changed, 5 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/aconfig/Android.bp b/libs/WindowManager/Shell/aconfig/Android.bp
index 1a98ffcea9e7..3891eebbc01f 100644
--- a/libs/WindowManager/Shell/aconfig/Android.bp
+++ b/libs/WindowManager/Shell/aconfig/Android.bp
@@ -1,6 +1,7 @@
aconfig_declarations {
name: "com_android_wm_shell_flags",
package: "com.android.wm.shell",
+ container: "system",
srcs: [
"multitasking.aconfig",
],
@@ -9,4 +10,4 @@ aconfig_declarations {
java_aconfig_library {
name: "com_android_wm_shell_flags_lib",
aconfig_declarations: "com_android_wm_shell_flags",
-} \ No newline at end of file
+}
diff --git a/libs/WindowManager/Shell/aconfig/multitasking.aconfig b/libs/WindowManager/Shell/aconfig/multitasking.aconfig
index 4511f3b91c5c..c0ecb8d78f5e 100644
--- a/libs/WindowManager/Shell/aconfig/multitasking.aconfig
+++ b/libs/WindowManager/Shell/aconfig/multitasking.aconfig
@@ -1,4 +1,5 @@
package: "com.android.wm.shell"
+container: "system"
flag {
name: "example_flag"
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 14e865366371..656cb12a61df 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -31,6 +31,7 @@ license {
aconfig_declarations {
name: "hwui_flags",
package: "com.android.graphics.hwui.flags",
+ container: "system",
srcs: [
"aconfig/hwui_flags.aconfig",
],
diff --git a/libs/hwui/aconfig/hwui_flags.aconfig b/libs/hwui/aconfig/hwui_flags.aconfig
index ca119757e816..920add5e0406 100644
--- a/libs/hwui/aconfig/hwui_flags.aconfig
+++ b/libs/hwui/aconfig/hwui_flags.aconfig
@@ -1,4 +1,5 @@
package: "com.android.graphics.hwui.flags"
+container: "system"
flag {
name: "matrix_44"