Merge "Move Nearby flags to common and add specify it in java_sdk_library" into main am: c92872e3d5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2973051
Change-Id: I2ab3e9f5716a33b8901cb03f109df721b10258e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/common/FlaggedApi.bp b/common/FlaggedApi.bp
index c382e76..449d7ae 100644
--- a/common/FlaggedApi.bp
+++ b/common/FlaggedApi.bp
@@ -21,3 +21,11 @@
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 ebfe382..ad9d094 100644
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@@ -197,6 +197,7 @@
],
aconfig_declarations: [
"com.android.net.flags-aconfig",
+ "nearby_flags",
],
}