Move nearby apex to tethering
Nearby will be merged together with the tethering/connectivity APEX, so
that module maintenance efforts can be reduced, and the two codebases
can evolve the interfaces that they expose to each other over time.
Bug: 189355156
Test: m
Change-Id: I7c34466a850cb437171ea15367a24f84305bd3f7
diff --git a/nearby/framework/Android.bp b/nearby/framework/Android.bp
index fd7f2c9..ec854df 100644
--- a/nearby/framework/Android.bp
+++ b/nearby/framework/Android.bp
@@ -16,6 +16,8 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
+// Sources included in the framework-connectivity-t jar
+// TODO: consider moving files to packages/modules/Connectivity
filegroup {
name: "framework-nearby-java-sources",
srcs: [
@@ -23,7 +25,9 @@
"java/**/*.aidl",
],
path: "java",
- visibility: ["//visibility:private"],
+ visibility: [
+ "//packages/modules/Connectivity/framework-t:__subpackages__",
+ ],
}
filegroup {
@@ -34,69 +38,18 @@
visibility: ["//frameworks/base"],
}
-// Defaults shared between `framework-nearby` & `framework-nearby-pre-jarjar`
-java_defaults {
- name: "framework-nearby-defaults",
- defaults: ["nearby-module-sdk-version-defaults"],
- srcs: [
- ":framework-nearby-java-sources",
- ],
- static_libs: [
- "modules-utils-preconditions",
- ],
-}
-
-// Defaults for SDK versions.
-java_defaults {
- name: "nearby-module-sdk-version-defaults",
- min_sdk_version: "current",
- target_sdk_version: "current",
-}
-
-// Nearby-service needs pre-jarjared version of framework-nearby so it can reference copied utility
-// classes before they are renamed.
+// Build of only framework-nearby (not as part of connectivity) for
+// unit tests
java_library {
- name: "framework-nearby-pre-jarjar",
- defaults: ["framework-nearby-defaults"],
+ name: "framework-nearby-static",
+ srcs: [":framework-nearby-java-sources"],
sdk_version: "module_current",
libs: [
"framework-annotations-lib",
"framework-bluetooth",
],
- // java_api_finder must accompany `srcs` (`srcs` defined in `framework-nearby-defaults`)
- plugins: ["java_api_finder"],
- installable: false,
- visibility: [
- "//packages/modules/Nearby/service",
- "//packages/modules/Nearby/halfsheet",
- "//packages/modules/Nearby/tests:__subpackages__",
+ static_libs: [
+ "modules-utils-preconditions",
],
-}
-
-// SDK library for nearby module API.
-java_sdk_library {
- name: "framework-nearby",
- defaults: [
- "framework-module-defaults", // the SDK needs to be usable in all processes
- "framework-nearby-defaults",
- ],
- libs: ["framework-bluetooth"],
-
- jarjar_rules: ":nearby-jarjar-rules",
- apex_available: [
- "com.android.nearby",
- ],
- installable: true,
- optimize: {
- enabled: false
- },
-
- // Restrict access to implementation library.
- impl_library_visibility: [
- "//packages/modules/Nearby/service:__subpackages__",
- ],
- permitted_packages: [
- "android.nearby",
- "com.android.nearby",
- ],
+ visibility: ["//packages/modules/Nearby/tests:__subpackages__"],
}