diff options
| author | David Su <dysu@google.com> | 2020-10-26 11:12:04 -0700 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2020-11-10 12:15:27 +0900 |
| commit | 52a87d283911c9332f610ee6b471f76ea6b192d0 (patch) | |
| tree | c8a796fd256b4e4aafb630fde658142feb32fb4f /wifi/tests | |
| parent | 1f65c6b62eefa4b88b78bf65f2be968ae2030552 (diff) | |
Add dependency on modules-utils-build
Partial cherry-pick of change "Migrate wifi.SdkLevelUtil to
com.android.modules.utils.build.SdkLevel".
Bug: 170538050
Test: boots up and connects to wifi
Merged-In: I8fca04fa22d6053aff0f58730adfa87f0bafaa3a
Change-Id: Id7137a44ea3117787475638a02e001a37b6cc7b8
Diffstat (limited to 'wifi/tests')
| -rw-r--r-- | wifi/tests/Android.bp | 7 | ||||
| -rw-r--r-- | wifi/tests/test-jarjar-rules.txt | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/wifi/tests/Android.bp b/wifi/tests/Android.bp index 6a39959e8cfd..b710a1492d8c 100644 --- a/wifi/tests/Android.bp +++ b/wifi/tests/Android.bp @@ -31,10 +31,11 @@ android_test { static_libs: [ "androidx.test.rules", "core-test-rules", + "frameworks-base-testutils", "guava", "mockito-target-minus-junit4", + "modules-utils-build", "net-tests-utils", - "frameworks-base-testutils", "truth-prebuilt", ], @@ -47,4 +48,8 @@ android_test { "device-tests", "mts", ], + + // static libs used by both framework-wifi & FrameworksWifiApiTests. Need to rename test usage + // to a different package name to prevent conflict with the copy in production code. + jarjar_rules: "test-jarjar-rules.txt", } diff --git a/wifi/tests/test-jarjar-rules.txt b/wifi/tests/test-jarjar-rules.txt new file mode 100644 index 000000000000..41b97abb87b5 --- /dev/null +++ b/wifi/tests/test-jarjar-rules.txt @@ -0,0 +1 @@ +rule com.android.modules.utils.** com.android.wifi.test.x.@0 |