diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2022-01-31 12:30:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-31 12:30:30 +0000 |
| commit | c83e84d0c717c0e2c6cf725dbe260d07e6815a93 (patch) | |
| tree | 1c2602b1ea1d5d32a30e091bc83e9fc33da876c2 | |
| parent | 3f384b22aa6da21a08ec2657df94f35690264211 (diff) | |
| parent | 2a4bf36754c0a1dadab0457c580ac226a26dcc4a (diff) | |
| download | net-c83e84d0c717c0e2c6cf725dbe260d07e6815a93.tar.gz | |
Merge "Use module API in common libraries" am: 2a4bf36754
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1959135
Change-Id: I2f1267a365c9479e6918567a925358aa3f90b065
| -rw-r--r-- | common/Android.bp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/common/Android.bp b/common/Android.bp index 13c6cb0f..940f1d6c 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -117,7 +117,7 @@ java_library { "device/com/android/net/module/util/Struct.java", "device/com/android/net/module/util/TcUtils.java", ], - sdk_version: "system_current", + sdk_version: "module_current", min_sdk_version: "29", visibility: [ "//frameworks/libs/net/common/tests:__subpackages__", @@ -128,6 +128,7 @@ java_library { ], libs: [ "androidx.annotation_annotation", + "framework-connectivity.stubs.module_lib", ], apex_available: [ "com.android.tethering", @@ -145,7 +146,7 @@ java_library { "device/com/android/net/module/util/Struct.java", "device/com/android/net/module/util/structs/*.java", ], - sdk_version: "system_current", + sdk_version: "module_current", min_sdk_version: "29", visibility: [ "//frameworks/libs/net/common/testutils:__subpackages__", @@ -157,6 +158,7 @@ java_library { ], libs: [ "androidx.annotation_annotation", + "framework-connectivity.stubs.module_lib", ], apex_available: [ "com.android.tethering", @@ -170,7 +172,7 @@ java_library { srcs: [ "device/com/android/net/module/util/netlink/*.java", ], - sdk_version: "system_current", + sdk_version: "module_current", min_sdk_version: "29", visibility: [ "//frameworks/libs/net/common/testutils:__subpackages__", @@ -182,6 +184,7 @@ java_library { ], libs: [ "androidx.annotation_annotation", + "framework-connectivity.stubs.module_lib", ], apex_available: [ "com.android.tethering", @@ -225,11 +228,12 @@ java_library { name: "net-utils-framework-common", srcs: [ ":net-utils-framework-common-srcs", - // TODO: avoid including all framework annotations as they end up in library users jars - // and need jarjaring - ":framework-annotations", ], - sdk_version: "system_current", + sdk_version: "module_current", + libs: [ + "framework-annotations-lib", + "framework-connectivity.stubs.module_lib", + ], jarjar_rules: "jarjar-rules-shared.txt", visibility: [ "//cts/tests/tests/net", |