diff options
| -rw-r--r-- | service/Android.bp | 6 | ||||
| -rw-r--r-- | tests/wifitests/Android.bp | 24 |
2 files changed, 26 insertions, 4 deletions
diff --git a/service/Android.bp b/service/Android.bp index f587c9c76..f54e406e9 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -74,7 +74,7 @@ cc_library_shared { // Build the wifi-service static library // ============================================================ java_library { - name: "WifiStackBase", + name: "wifi-service", installable: true, defaults: ["WifiStackCommon"], aidl: { @@ -126,12 +126,12 @@ java_defaults { name: "WifiStackAppCommon", defaults: ["WifiStackCommon"], static_libs: [ - "WifiStackBase", + "wifi-service", ], jni_libs: [ "libwifi-jni", ], - // Resources already included in WifiStackBase + // Resources already included in wifi-service resource_dirs: [], jarjar_rules: "jarjar-rules-shared.txt", optimize: { diff --git a/tests/wifitests/Android.bp b/tests/wifitests/Android.bp index b0ff2cf90..3e36e9208 100644 --- a/tests/wifitests/Android.bp +++ b/tests/wifitests/Android.bp @@ -21,6 +21,28 @@ android_test { srcs: ["**/*.java"], + // For coverage + jacoco: { + include_filter: [ + "com.android.server.wifi.*", + "com.android.server.wifi.aware.*", + "com.android.server.wifi.hotspot2.*", + "com.android.server.wifi.hotspot2.anqp.*", + "com.android.server.wifi.hotspot2.anqp.eap.*", + "com.android.server.wifi.hotspot2.omadm.*", + "com.android.server.wifi.hotspot2.soap.*", + "com.android.server.wifi.hotspot2.soap.command.*", + "com.android.server.wifi.p2p.*", + "com.android.server.wifi.rtt.*", + "com.android.server.wifi.scanner.*", + "com.android.server.wifi.util.*", + "com.android.server.wifi.wificond.*", + ], + exclude_filter: [ + "com.android.server.wifi.ClientModeImplTest", + ], + }, + dxflags: ["--multi-dex"], // wifi-service and services must be included here so that the latest changes @@ -34,7 +56,7 @@ android_test { "mockito-target-extended-minus-junit4", "frameworks-base-testutils", "services", - "WifiStackBase", + "wifi-service", "truth-prebuilt", ], |