Merge "Move ArpPacket.java to frameworks/libs/net" into main

This commit is contained in:
Yuyang Huang 2023-08-24 07:12:27 +00:00 • committed by Gerrit Code Review
commit 136bf7c8e3
2 changed files with 3 additions and 2 deletions

View file

@ -25,11 +25,12 @@ java_defaults {
],
min_sdk_version: "30",
static_libs: [
"NetworkStackApiStableLib",
"DhcpPacketLib",
"androidx.test.rules",
"cts-net-utils",
"mockito-target-extended-minus-junit4",
"net-tests-utils",
"net-utils-device-common",
"net-utils-device-common-bpf",
"testables",
"connectivity-net-module-utils-bpf",

View file

@ -74,6 +74,7 @@ import com.android.net.module.util.DnsPacket;
import com.android.net.module.util.Ipv6Utils;
import com.android.net.module.util.PacketBuilder;
import com.android.net.module.util.Struct;
import com.android.net.module.util.arp.ArpPacket;
import com.android.net.module.util.structs.EthernetHeader;
import com.android.net.module.util.structs.Icmpv4Header;
import com.android.net.module.util.structs.Icmpv6Header;
@ -85,7 +86,6 @@ import com.android.net.module.util.structs.PrefixInformationOption;
import com.android.net.module.util.structs.RaHeader;
import com.android.net.module.util.structs.TcpHeader;
import com.android.net.module.util.structs.UdpHeader;
import com.android.networkstack.arp.ArpPacket;
import com.android.testutils.TapPacketReader;
import java.net.Inet4Address;