diff options
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | apex/jobscheduler/framework/Android.bp | 1 | ||||
| -rw-r--r-- | core/jni/Android.bp | 2 | ||||
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 | ||||
| -rw-r--r-- | packages/Connectivity/framework/Android.bp | 2 | ||||
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/NetworkUtils.java | 3 |
6 files changed, 12 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp index 33b66b602024..8b15f02b06ed 100644 --- a/Android.bp +++ b/Android.bp @@ -465,6 +465,7 @@ java_library { static_libs: [ "android.net.ipsec.ike.stubs.module_lib", "framework-appsearch.stubs.module_lib", + "framework-connectivity.stubs.module_lib", "framework-graphics.stubs.module_lib", "framework-media.stubs.module_lib", "framework-mediaprovider.stubs.module_lib", @@ -487,6 +488,7 @@ java_library { "android.net.ipsec.ike.impl", "framework-minus-apex", "framework-appsearch.impl", + "framework-connectivity.impl", "framework-graphics.impl", "framework-mediaprovider.impl", "framework-permission.impl", @@ -643,14 +645,17 @@ java_defaults { defaults: ["framework-aidl-export-defaults"], srcs: [ ":framework-non-updatable-sources", - ":framework-connectivity-sources", "core/java/**/*.logtags", ], // See comment on framework-atb-backward-compatibility module below exclude_srcs: ["core/java/android/content/pm/AndroidTestBaseUpdater.java"], aidl: { generate_get_transaction_name: true, - local_include_dirs: ["media/aidl"], + local_include_dirs: [ + "media/aidl", + // TODO: move to include_dirs when migrated to packages/modules + "packages/Connectivity/framework/aidl-export", + ], include_dirs: ["frameworks/av/aidl"], }, dxflags: [ @@ -703,8 +708,6 @@ java_library { apex_available: ["//apex_available:platform"], visibility: [ "//frameworks/base", - // TODO: remove when framework-connectivity can build against API - "//frameworks/base/packages/Connectivity/framework", // TODO(b/147128803) remove the below lines "//frameworks/base/apex/appsearch/framework", "//frameworks/base/apex/blobstore/framework", @@ -743,6 +746,7 @@ java_library { static_libs: [ "app-compat-annotations", "framework-minus-apex", + "framework-connectivity.impl", // TODO(b/182859030): should be removed "framework-appsearch.impl", // TODO(b/146218515): should be removed "framework-updatable-stubs-module_libs_api", ], diff --git a/apex/jobscheduler/framework/Android.bp b/apex/jobscheduler/framework/Android.bp index b51c2aae0bb8..f766fcffb58c 100644 --- a/apex/jobscheduler/framework/Android.bp +++ b/apex/jobscheduler/framework/Android.bp @@ -32,6 +32,7 @@ java_library { }, libs: [ "app-compat-annotations", + "framework-connectivity.stubs.module_lib", "framework-minus-apex", "unsupportedappusage", ], diff --git a/core/jni/Android.bp b/core/jni/Android.bp index f1fa5dbcbbdc..20d257e98278 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -221,7 +221,6 @@ cc_library_shared { static_libs: [ "libasync_safe", - "libconnectivityframeworkutils", "libbinderthreadstateutils", "libdmabufinfo", "libgif", @@ -238,7 +237,6 @@ cc_library_shared { "android.hardware.camera.device@3.2", "media_permission-aidl-cpp", "libandroidicu", - "libandroid_net", "libbpf_android", "libnetdbpf", "libnetdutils", diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 94ac183517a2..0c3f265b84cc 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -156,7 +156,6 @@ extern int register_android_os_SharedMemory(JNIEnv* env); extern int register_android_service_DataLoaderService(JNIEnv* env); extern int register_android_os_incremental_IncrementalManager(JNIEnv* env); extern int register_android_net_LocalSocketImpl(JNIEnv* env); -extern int register_android_net_NetworkUtils(JNIEnv* env); extern int register_android_text_AndroidCharacter(JNIEnv *env); extern int register_android_text_Hyphenator(JNIEnv *env); extern int register_android_opengl_classes(JNIEnv *env); @@ -1548,7 +1547,6 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_os_Trace), REG_JNI(register_android_os_UEventObserver), REG_JNI(register_android_net_LocalSocketImpl), - REG_JNI(register_android_net_NetworkUtils), REG_JNI(register_android_os_MemoryFile), REG_JNI(register_android_os_SharedMemory), REG_JNI(register_android_os_incremental_IncrementalManager), diff --git a/packages/Connectivity/framework/Android.bp b/packages/Connectivity/framework/Android.bp index fdfb1086de0b..74cecdd351b3 100644 --- a/packages/Connectivity/framework/Android.bp +++ b/packages/Connectivity/framework/Android.bp @@ -35,7 +35,6 @@ java_library { ":framework-javastream-protos", ], apex_available: [ - "//apex_available:platform", "com.android.tethering", ], jarjar_rules: "jarjar-rules-proto.txt", @@ -125,7 +124,6 @@ java_sdk_library { "//packages/modules/Connectivity/Tethering/tests/unit", ], apex_available: [ - "//apex_available:platform", "com.android.tethering", ], } diff --git a/packages/Connectivity/framework/src/android/net/NetworkUtils.java b/packages/Connectivity/framework/src/android/net/NetworkUtils.java index 16a49bcae7ee..2679b6218c19 100644 --- a/packages/Connectivity/framework/src/android/net/NetworkUtils.java +++ b/packages/Connectivity/framework/src/android/net/NetworkUtils.java @@ -42,6 +42,9 @@ import java.util.TreeSet; * {@hide} */ public class NetworkUtils { + static { + System.loadLibrary("framework-connectivity-jni"); + } private static final String TAG = "NetworkUtils"; |