joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Move jarjar rules from NetworkStaticTestsLib to NetworkStaticTests"

Browse source
This commit is contained in:
Mark Chien 2020-10-26 12:22:32 +00:00 • committed by Gerrit Code Review
commit dea71cd586
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
staticlibs/tests/unit/Android.bp
View file

@ -6,7 +6,6 @@ android_library {
name: "NetworkStaticLibTestsLib",
srcs: ["src/**/*.java","src/**/*.kt"],
min_sdk_version: "29",
jarjar_rules: "jarjar-rules.txt",
static_libs: [
"net-utils-framework-common",
"androidx.test.rules",
@ -17,6 +16,7 @@ android_library {
"android.test.runner",
"android.test.base",
],
jarjar_rules: "jarjar-rules-sharedlib.txt",
visibility: [
"//frameworks/base/packages/Tethering/tests/integration",
"//packages/modules/NetworkStack/tests/integration",
@ -29,6 +29,7 @@ android_test {
static_libs: [
"NetworkStaticLibTestsLib",
],
jarjar_rules: "jarjar-rules.txt",
test_suites: ["device-tests"],
}

6
staticlibs/tests/unit/jarjar-rules-sharedlib.txt Normal file
View file

@ -0,0 +1,6 @@
# TODO: move the classes to the target package in java
rule android.net.util.IpRange* com.android.net.module.util.IpRange@1
rule android.net.util.MacAddressUtils* com.android.net.module.util.MacAddressUtils@1
rule android.net.util.LinkPropertiesUtils* com.android.net.module.util.LinkPropertiesUtils@1
rule android.net.util.NetUtils* com.android.net.module.util.NetUtils@1
rule android.net.util.nsd.** com.android.net.module.util.nsd.@1

6
staticlibs/tests/unit/jarjar-rules.txt
View file

@ -1,7 +1 @@
# TODO: move the classes to the target package in java
rule android.net.util.IpRange* com.android.net.moduletests.util.IpRange@1
rule android.net.util.MacAddressUtils* com.android.net.moduletests.util.MacAddressUtils@1
rule android.net.util.LinkPropertiesUtils* com.android.net.moduletests.util.LinkPropertiesUtils@1
rule android.net.util.NetUtils* com.android.net.moduletests.util.NetUtils@1
rule android.net.util.nsd.** com.android.net.moduletests.util.nsd.@1
rule com.android.net.module.util.** com.android.net.moduletests.util.@1