Merge "Adding BT dependency on the Wifi framework module"
diff --git a/framework/Android.bp b/framework/Android.bp
index 0730f28..28bccb9 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -94,10 +94,10 @@
static_libs: [
"framework-wifi-util-lib",
"android.hardware.wifi-V1.0-java-constants",
- "androidx.annotation_annotation",
"wifi-modules-utils",
],
libs: [
+ "androidx.annotation_annotation",
"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
"framework-connectivity.stubs.module_lib",
],
diff --git a/framework/jarjar-rules.txt b/framework/jarjar-rules.txt
index a36b453..9d84c09 100644
--- a/framework/jarjar-rules.txt
+++ b/framework/jarjar-rules.txt
@@ -72,8 +72,6 @@
rule android.net.util.SharedLog* com.android.wifi.x.@0
rule android.net.util.NetUtils* com.android.wifi.x.@0
-rule androidx.annotation.** com.android.wifi.x.@0
-
# We don't jar-jar the entire package because, we still use some classes (like
# AsyncChannel in com.android.internal.util) from these packages which are not
# inside our jar (currently in framework.jar, but will be in wifisdk.jar in the future).
diff --git a/service/Android.bp b/service/Android.bp
index 9392354..8e1a2a7 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -63,6 +63,7 @@
strict_updatability_linting: true,
},
libs: [
+ "androidx.annotation_annotation",
"error_prone_annotations",
"jsr305",
"framework-annotations-lib",
@@ -95,7 +96,6 @@
"android.hardware.wifi.supplicant-V1.3-java",
"android.hardware.wifi.supplicant-V1.4-java",
"android.hidl.manager-V1.2-java",
- "androidx.annotation_annotation",
"bouncycastle-unbundled",
"ksoap2",
// Note: libprotobuf-java-lite uses a few core platform APIs which
