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/framework/Android.bp b/framework/Android.bp
index a969c83..4fa9ccb 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -22,7 +22,6 @@
java_library {
name: "framework-connectivity-protos",
sdk_version: "module_current",
- min_sdk_version: "30",
proto: {
type: "nano",
},
@@ -106,10 +105,6 @@
"-Wall",
"-Werror",
"-Wno-unused-parameter",
- // Don't warn about S API usage even with
- // min_sdk 30: the library is only loaded
- // on S+ devices
- "-Wno-unguarded-availability",
"-Wthread-safety",
],
shared_libs: [
@@ -136,7 +131,6 @@
cc_library_shared {
name: "libframework-connectivity-jni",
- min_sdk_version: "30",
defaults: ["libframework-connectivity-defaults"],
srcs: [
"jni/android_net_NetworkUtils.cpp",
@@ -153,7 +147,6 @@
java_library {
name: "framework-connectivity.impl",
sdk_version: "module_current",
- min_sdk_version: "30",
srcs: [
":framework-connectivity-sources",
],
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",
diff --git a/service/ServiceConnectivityResources/Android.bp b/service/ServiceConnectivityResources/Android.bp
index f491cc7..912d99f 100644
--- a/service/ServiceConnectivityResources/Android.bp
+++ b/service/ServiceConnectivityResources/Android.bp
@@ -22,7 +22,6 @@
android_app {
name: "ServiceConnectivityResources",
sdk_version: "module_30",
- min_sdk_version: "30",
resource_dirs: [
"res",
],
diff --git a/service/jni/com_android_server_TestNetworkService.cpp b/service/jni/com_android_server_TestNetworkService.cpp
index e7a40e5..36a6fde 100644
--- a/service/jni/com_android_server_TestNetworkService.cpp
+++ b/service/jni/com_android_server_TestNetworkService.cpp
@@ -35,6 +35,8 @@
#include <log/log.h>
+#include "netutils/ifc.h"
+
#include "jni.h"
#include <android-base/stringprintf.h>
#include <android-base/unique_fd.h>
@@ -46,8 +48,9 @@
//------------------------------------------------------------------------------
static void throwException(JNIEnv* env, int error, const char* action, const char* iface) {
- const std::string& msg = "Error: " + std::string(action) + " " + std::string(iface) + ": "
- + std::string(strerror(error));
+ const std::string& msg =
+ android::base::StringPrintf("Error %s %s: %s", action, iface, strerror(error));
+
jniThrowException(env, "java/lang/IllegalStateException", msg.c_str());
}