commit 15754248e85aa954c094bfd2cf4a49a392ab24ad
author Patrick Rohr <prohr@google.com> Thu May 16 11:38:57 2024 -0700
committer Patrick Rohr <prohr@google.com> Wed May 22 10:50:55 2024 -0700
tree 74e8ab6fbbfc593108c55135acda587b79e6672a
parent b15be228d26e819569296ff0bf7905499fcc78ef

Use scopeguard from libbase_headers and delete the copy

A recent change makes libbase_headers available to the tethering apex.

Test: m
Change-Id: Id4f30f48bd65175e17c419230a8e7ebf5339d713

staticlibs/native/tcutils/Android.bp

diff --git a/staticlibs/native/tcutils/Android.bp b/staticlibs/native/tcutils/Android.bp
index 926590d..e4742ce 100644
--- a/staticlibs/native/tcutils/Android.bp
+++ b/staticlibs/native/tcutils/Android.bp
@@ -21,7 +21,10 @@
     name: "libtcutils",
     srcs: ["tcutils.cpp"],
     export_include_dirs: ["include"],
-    header_libs: ["bpf_headers"],
+    header_libs: [
+        "bpf_headers",
+        "libbase_headers",
+    ],
     shared_libs: [
         "liblog",
     ],
@@ -31,7 +34,7 @@
         "-Werror",
         "-Wno-unused-parameter",
     ],
-    sdk_version: "30",
+    sdk_version: "current",
     min_sdk_version: "30",
     apex_available: [
         "com.android.tethering",