commit 64f0223612beeeeca8fe9d9062786b1498141684
author Lorenzo Colitti <lorenzo@google.com> Wed Feb 02 23:59:02 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 02 23:59:02 2022 +0000
tree 1ac0d63c9cf7866a7e756088940f13c0aac2d8d0
parent 25bad1e9a01c642d2090e96961a90ae75d0e0f98
parent 7174ac3d86d1646a1b8dde88a29d8a06109b5988

Merge "Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests"

Tethering/Android.bp

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index ecbaf61..af247de 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -112,7 +112,6 @@
     static_libs: [
         "libnet_utils_device_common_bpfjni",
         "libnetjniutils",
-        "libtcutils",
     ],
 
     // We cannot use plain "libc++" here to link libc++ dynamically because it results in:

Tethering/apex/canned_fs_config

diff --git a/Tethering/apex/canned_fs_config b/Tethering/apex/canned_fs_config
index 06e9617..5a03347 100644
--- a/Tethering/apex/canned_fs_config
+++ b/Tethering/apex/canned_fs_config
@@ -1,2 +1,2 @@
-/bin/for-system 0 1000 0550
+/bin/for-system 0 1000 0750
 /bin/for-system/clatd 1029 1029 06755

netd/Android.bp

diff --git a/netd/Android.bp b/netd/Android.bp
index 53c1bd4..38a11ac 100644
--- a/netd/Android.bp
+++ b/netd/Android.bp
@@ -32,10 +32,10 @@
         "NetdUpdatable.cpp",
     ],
     static_libs: [
+        "libbase",
         "libnetdutils",
     ],
     shared_libs: [
-        "libbase",
         "liblog",
     ],
     export_include_dirs: ["include"],

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index 1c3b952..608ee12 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -36,7 +36,6 @@
     stl: "libc++_static",
     static_libs: [
         "libnet_utils_device_common_bpfjni",
-        "libtcutils",
     ],
     shared_libs: [
         "liblog",