diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 36 |
1 files changed, 19 insertions, 17 deletions
@@ -32,11 +32,6 @@ cc_defaults { // Bug: http://b/33566695 "-Wno-address-of-packed-member", ], - - // For MARK_UNSET. - header_libs: [ - "libnetd_client_headers" - ], } // Code used both by the daemon and by unit tests. @@ -50,10 +45,6 @@ filegroup { "ipv4.c", "ipv6.c", "logging.c", - "netlink_callbacks.c", - "netlink_msg.c", - "ring.c", - "setif.c", "translate.c", ], } @@ -62,16 +53,25 @@ filegroup { cc_binary { name: "clatd", defaults: ["clatd_defaults"], + // TODO: remove once drop_root_and_caps() is removed. + header_libs: [ + "libcutils_headers", // for AID_CLAT + ], srcs: [ ":clatd_common", "main.c" ], - static_libs: ["libnl"], + static_libs: [ + "libip_checksum", + ], shared_libs: [ - "libcutils", "liblog", - "libnetutils", ], + relative_install_path: "for-system", + + // Static libc++ for smaller apex size while shipping clatd in the mainline module. + // See b/213123047 + stl: "libc++_static", // Only enable clang-tidy for the daemon, not the tests, because enabling it for the // tests substantially increases build/compile cycle times and doesn't really provide a @@ -86,13 +86,15 @@ cc_binary { tidy_flags: [ "-warnings-as-errors=clang-analyzer-security*,cert-*,android-*", ], - // Actually not required for clatd itself. See comments in the rc file. - init_rc: [ - "vendor-464xlat.rc", - ], sanitize: { memtag_heap: true, }, + + apex_available: [ + "com.android.tethering", + "//apex_available:platform", + ], + min_sdk_version: "30", } // Unit tests. @@ -105,8 +107,8 @@ cc_test { ], static_libs: [ "libbase", + "libip_checksum", "libnetd_test_tun_interface", - "libnl", ], shared_libs: [ "libcutils", |