commit 108a2d6360823a2e57222797d104607470f5e37e
author Oriol Prieto Gascó <opg@google.com> Tue Feb 06 00:38:23 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 06 00:38:23 2024 +0000
tree ddd6d326d6c103be8be51d71c66b612bb6f86fc2
parent 54d62cee14580031753b833e85e611876049c1af
parent 6eec17aa975dcc32bf3549a6134d3acb3e74a00c

Merge "Set the container field of aconfig flags" into main

common/FlaggedApi.bp

diff --git a/common/FlaggedApi.bp b/common/FlaggedApi.bp
index 2cb9b2f..c382e76 100644
--- a/common/FlaggedApi.bp
+++ b/common/FlaggedApi.bp
@@ -17,6 +17,7 @@
 aconfig_declarations {
     name: "com.android.net.flags-aconfig",
     package: "com.android.net.flags",
+    container: "system",
     srcs: ["flags.aconfig"],
     visibility: ["//packages/modules/Connectivity:__subpackages__"],
 }

common/flags.aconfig

diff --git a/common/flags.aconfig b/common/flags.aconfig
index 8eb3cbf..30f5d9c 100644
--- a/common/flags.aconfig
+++ b/common/flags.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.net.flags"
+container: "system"
 
 # This file contains aconfig flags for FlaggedAPI annotations
 # Flags used from platform code must be in under frameworks

thread/flags/thread_base.aconfig

diff --git a/thread/flags/thread_base.aconfig b/thread/flags/thread_base.aconfig
index bf1f288..09595a6 100644
--- a/thread/flags/thread_base.aconfig
+++ b/thread/flags/thread_base.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.net.thread.flags"
+container: "system"
 
 flag {
     name: "thread_enabled"