diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-04-11 19:29:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-11 19:29:49 +0000 |
| commit | 330f2f716b2aebcfdb72d6218095e02894d99caf (patch) | |
| tree | c9bab9ffa51d37017b37d93ae5af92a2af963d75 | |
| parent | 67cb0ae09de08ac99ce23a0ff5350f6c6e255bc4 (diff) | |
| parent | bb3a059705ca6a22bf6278499c92ad5a816414e4 (diff) | |
| download | development-330f2f716b2aebcfdb72d6218095e02894d99caf.tar.gz | |
Merge "Factor libc++_host use into llvm_host_defaults" into main
| -rw-r--r-- | vndk/tools/header-checker/Android.bp | 5 | ||||
| -rw-r--r-- | vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/vndk/tools/header-checker/Android.bp b/vndk/tools/header-checker/Android.bp index fdf9c5a8f..b1525d3e3 100644 --- a/vndk/tools/header-checker/Android.bp +++ b/vndk/tools/header-checker/Android.bp @@ -49,7 +49,6 @@ cc_defaults { ], compile_multilib: "64", - stl: "none", } cc_binary_host { @@ -77,7 +76,6 @@ cc_binary_host { shared_libs: [ "libprotobuf-cpp-full", "libclang-cpp_host", - "libc++_host", ], } @@ -95,7 +93,6 @@ cc_defaults { shared_libs: [ "libprotobuf-cpp-full", "libclang-cpp_host", - "libc++_host", ], } @@ -170,7 +167,6 @@ cc_library_host_static { shared_libs: [ "libclang-cpp_host", - "libc++_host", "libprotobuf-cpp-full", ], @@ -209,7 +205,6 @@ cc_test_host { shared_libs: [ "libclang-cpp_host", - "libc++_host", ], test_suites: ["general-tests"], diff --git a/vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp b/vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp index f05a007a5..0319ef25e 100644 --- a/vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp +++ b/vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp @@ -34,8 +34,6 @@ cc_library_host_static { canonical_path_from_root: false, }, - shared_libs: ["libc++_host"], - cflags: [ "-Wall", "-Werror", @@ -52,6 +50,5 @@ cc_library_host_static { }, }, - stl: "none", compile_multilib: "64", } |