From 259be7bd4eeda81a5a5d0aaa55060eace5470502 Mon Sep 17 00:00:00 2001
From: Yahav Nussbaum <yahav@google.com>
Date: Thu, 22 Feb 2024 06:22:31 +0000
Subject: [PATCH] Move Nearby flags to common and add specify it in
 java_sdk_library

Bug: 324993608
Test: TH
Change-Id: I1dc79353e9bae3d977db88e572e871cd459fc7fc
---
 common/FlaggedApi.bp                          | 8 ++++++++
 {nearby/flags => common}/nearby_flags.aconfig | 0
 framework-t/Android.bp                        | 1 +
 3 files changed, 9 insertions(+)
 rename {nearby/flags => common}/nearby_flags.aconfig (100%)

diff --git a/common/FlaggedApi.bp b/common/FlaggedApi.bp
index c382e76234..449d7ae77e 100644
--- a/common/FlaggedApi.bp
+++ b/common/FlaggedApi.bp
@@ -21,3 +21,11 @@ aconfig_declarations {
     srcs: ["flags.aconfig"],
     visibility: ["//packages/modules/Connectivity:__subpackages__"],
 }
+
+aconfig_declarations {
+    name: "nearby_flags",
+    package: "com.android.nearby.flags",
+    container: "system",
+    srcs: ["nearby_flags.aconfig"],
+    visibility: ["//packages/modules/Connectivity:__subpackages__"],
+}
diff --git a/nearby/flags/nearby_flags.aconfig b/common/nearby_flags.aconfig
similarity index 100%
rename from nearby/flags/nearby_flags.aconfig
rename to common/nearby_flags.aconfig
diff --git a/framework-t/Android.bp b/framework-t/Android.bp
index 9203a3ed27..e40b55cf09 100644
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@@ -197,6 +197,7 @@ java_sdk_library {
     ],
     aconfig_declarations: [
         "com.android.net.flags-aconfig",
+        "nearby_flags",
     ],
 }