commit 61f2acb01a1c308a46bf026f594c978b4406e6a5
author Patrick Rohr <prohr@google.com> Mon Oct 31 14:08:18 2022 -0700
committer Patrick Rohr <prohr@google.com> Mon Oct 31 14:51:53 2022 -0700
tree 39aa6d1ec9c0b72937eee27d9585806342fbbfcd
parent 3a1ec1d48f99cadbe3982cec6dcd60960a0bc595

gn2bp: use chromium libc++ headers

Test: //base:base
Change-Id: I1d73f843fb55d83964cbf01fddc0df9a4192a665

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index b33939e..d541ae6 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -213,6 +213,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
         "third_party/android_ndk/sources/android/cpufeatures/",
     ],
     cpp_std: "c++20",
@@ -954,6 +956,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
         "third_party/abseil-cpp/",
         "third_party/android_ndk/sources/android/cpufeatures/",
         "third_party/boringssl/src/include/",
@@ -1265,6 +1269,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
     ],
     cpp_std: "c++20",
 }
@@ -1583,6 +1589,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
     ],
     cpp_std: "c++20",
 }
@@ -1614,6 +1622,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
     ],
     cpp_std: "c++20",
 }
@@ -1735,6 +1745,7 @@
         "-Wno-unused-parameter",
         "-fvisibility=hidden",
     ],
+    stl: "none",
 }
 
 // GN: //third_party/abseil-cpp:absl
@@ -2804,6 +2815,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
         "third_party/boringssl/src/include/",
     ],
     cpp_std: "c++20",
@@ -2858,6 +2871,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
         "third_party/icu/source/common/",
         "third_party/icu/source/i18n/",
     ],
@@ -2906,6 +2921,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
         "third_party/icu/source/common/",
         "third_party/icu/source/i18n/",
     ],
@@ -2958,6 +2975,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
         "third_party/libevent/android/",
     ],
     cpp_std: "c++20",
@@ -2992,6 +3011,8 @@
     local_include_dirs: [
         "./",
         "buildtools/third_party/libc++/",
+        "buildtools/third_party/libc++/trunk/include",
+        "buildtools/third_party/libc++abi/trunk/include",
     ],
     cpp_std: "c++20",
 }