Merge "Move shared methods to NetUtils" am: ac148e6bfe am: 60de0b8a53 am: a2d2cbc185
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1571849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d083dd60d2a6c863462fb62cb9c819ed8a5825d
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index a3bfbce..ecff6c7 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -27,10 +27,6 @@
// included in the bootclasspath, they could incorrectly be included in the SDK documentation even
// though they are not in the current.txt files.
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
java_library {
name: "net-utils-device-common",
srcs: [
diff --git a/staticlibs/native/bpf_syscall_wrappers/Android.bp b/staticlibs/native/bpf_syscall_wrappers/Android.bp
index fa90655..ae6eee0 100644
--- a/staticlibs/native/bpf_syscall_wrappers/Android.bp
+++ b/staticlibs/native/bpf_syscall_wrappers/Android.bp
@@ -12,10 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
cc_library_headers {
name: "bpf_syscall_wrappers",
vendor_available: false,
diff --git a/staticlibs/native/netjniutils/Android.bp b/staticlibs/native/netjniutils/Android.bp
index d8e6a04..8417c52 100644
--- a/staticlibs/native/netjniutils/Android.bp
+++ b/staticlibs/native/netjniutils/Android.bp
@@ -12,10 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
cc_library_static {
name: "libnetjniutils",
srcs: ["netjniutils.cpp"],
diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp
index 4ce4b0e..c00202e 100644
--- a/staticlibs/tests/unit/Android.bp
+++ b/staticlibs/tests/unit/Android.bp
@@ -2,10 +2,6 @@
// Build NetworkStaticLibTests package
//########################################################################
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
android_library {
name: "NetworkStaticLibTestsLib",
srcs: ["src/**/*.java","src/**/*.kt"],
@@ -42,3 +38,4 @@
jarjar_rules: "jarjar-rules.txt",
test_suites: ["device-tests"],
}
+