diff options
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | tests/integration/Android.bp | 2 | ||||
| -rw-r--r-- | tests/integration/src/android/net/ip/IpClientIntegrationTest.java | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -185,7 +185,7 @@ android_library { name: "TestNetworkStackLib", defaults: ["NetworkStackAppDefaults", "NetworkStackApiCurrentLevel"], static_libs: ["NetworkStackApiCurrentLib"], - manifest: "AndroidManifest.xml", + manifest: "AndroidManifestBase.xml", } cc_library_shared { diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp index 89b3968..fdc9a53 100644 --- a/tests/integration/Android.bp +++ b/tests/integration/Android.bp @@ -24,8 +24,8 @@ android_test { "androidx.test.rules", "mockito-target-extended-minus-junit4", "net-tests-utils", - "NetworkStackApiCurrentLib", "testables", + "TestNetworkStackLib", ], libs: [ "android.test.runner", diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java index f34c26e..0ee49c5 100644 --- a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java +++ b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java @@ -24,8 +24,8 @@ import static android.net.dhcp.DhcpPacket.DHCP_SERVER; import static android.net.dhcp.DhcpPacket.ENCAP_L2; import static android.net.dhcp.DhcpPacket.INFINITE_LEASE; import static android.net.ipmemorystore.Status.SUCCESS; -import static android.net.shared.Inet4AddressUtils.getBroadcastAddress; -import static android.net.shared.Inet4AddressUtils.getPrefixMaskAsInet4Address; +import static android.net.networkstack.shared.Inet4AddressUtils.getBroadcastAddress; +import static android.net.networkstack.shared.Inet4AddressUtils.getPrefixMaskAsInet4Address; import static android.system.OsConstants.ETH_P_IPV6; import static android.system.OsConstants.IPPROTO_ICMPV6; import static android.system.OsConstants.IPPROTO_TCP; |