Skip to content

Commit 118e0cd

Browse files
committed
chore: drop the dead libc++ include path
src/main/cpp/include/libc++ has no tracked files and nothing populates it: download_v8.sh installs only the V8 include tree, which has no libc++. The comment above it described a custom STL that v8-buildscripts stopped producing when it moved to use_custom_libcxx=false against the stock NDK libc++; the constraint that replaces it is recorded where the monolith is linked.
1 parent 98968fd commit 118e0cd

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

test-app/runtime/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ endif()
4949

5050
# Command info: https://cmake.org/cmake/help/v3.4/command/include_directories.html
5151
include_directories(
52-
# V8 uses a custom STL compiled with the LIBCPP_ABI_UNSTABLE flag. To maintain the ABI
53-
# compatibility we use this same STL headers for building the runtime
54-
src/main/cpp/include/libc++
5552
src/main/cpp
5653
src/main/cpp/include
5754
src/main/cpp/v8_inspector
@@ -286,8 +283,11 @@ MESSAGE(STATUS "# CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS})
286283
MESSAGE(STATUS "# CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS})
287284

288285
# Command info: https://cmake.org/cmake/help/v3.4/command/target_link_libraries.html
289-
# linking v8 and custom STL libraries to the runtime (NativeScript library)
290286
target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libzip.a)
287+
# libv8_monolith.a carries the NDK libc++ it was compiled against, and libc++ is
288+
# only ABI-compatible with itself, so v8-buildscripts has to build V8 with the
289+
# same NDK the runtime uses (its android_ndk_root gn arg) -- see
290+
# docs/knowledge/v8-14-migration.md.
291291
target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID_ABI}/libv8_monolith.a)
292292

293293

0 commit comments

Comments
 (0)