Revert "Add min_sdk_version to connectivity targets"
This reverts commit 0b900c91f6784f06f247f809cbafb84b1fbc9e1c.
Reason for revert: Broke errorprone: b/190454846
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I21de7e7e06daa5f4a688b4246986f8d44da97c91
Fixes: 190454846
diff --git a/service/Android.bp b/service/Android.bp
index b07c55f..ec8887c 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -21,7 +21,7 @@
cc_library_shared {
name: "libservice-connectivity",
- min_sdk_version: "30",
+ // TODO: build against the NDK (sdk_version: "30" for example)
cflags: [
"-Wall",
"-Werror",
@@ -33,12 +33,13 @@
"jni/onload.cpp",
],
stl: "libc++_static",
- header_libs: [
- "libbase_headers",
- ],
shared_libs: [
+ "libbase",
"liblog",
"libnativehelper",
+ // TODO: remove dependency on ifc_[add/del]_address by having Java code to add/delete
+ // addresses, and remove dependency on libnetutils.
+ "libnetutils",
],
apex_available: [
"com.android.tethering",
@@ -48,7 +49,6 @@
java_library {
name: "service-connectivity-pre-jarjar",
sdk_version: "system_server_current",
- min_sdk_version: "30",
srcs: [
"src/**/*.java",
":framework-connectivity-shared-srcs",
@@ -87,7 +87,6 @@
java_library {
name: "service-connectivity-protos",
sdk_version: "system_current",
- min_sdk_version: "30",
proto: {
type: "nano",
},
@@ -104,7 +103,6 @@
java_library {
name: "service-connectivity",
sdk_version: "system_server_current",
- min_sdk_version: "30",
installable: true,
static_libs: [
"service-connectivity-pre-jarjar",