commit 27cd53422fdb89e5ed450867bb4ccfcfe8f996d2
author Liana Kazanova <lkazanova@google.com> Mon Jul 29 22:58:39 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 29 22:58:44 2024 +0000
tree 2b2b9d9f8ab8be2f53d81ddf102fa943cdc646e9
parent bc61b3ded6476eaed961a14544c836c5a3b01d86

Revert "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang"

Revert submission 3195358-ndk-libcxx

Reason for revert: Droidmonitor created revert due to b/356220894. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3195358-ndk-libcxx

Change-Id: If4bac6cca12a4c70bab22ffd310f262ef6f5fb78

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 1e98bc0..0bc9469 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -205,6 +205,8 @@
     my_api_level := $(my_ndk_api)
   endif
 
+  my_ndk_source_root := \
+      $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources
   my_built_ndk := $(SOONG_OUT_DIR)/ndk
   my_ndk_triple := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_TRIPLE)
   my_ndk_sysroot_include := \
@@ -237,18 +239,16 @@
   endif
 
   ifeq (system,$(LOCAL_NDK_STL_VARIANT))
-    my_ndk_source_root := \
-        $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources
     my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/system/include
     my_system_shared_libraries += libstdc++
   else ifneq (,$(filter c++_%, $(LOCAL_NDK_STL_VARIANT)))
-    my_llvm_dir := $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)
-    my_libcxx_arch_dir := $(my_llvm_dir)/android_libc++/ndk/$($(LOCAL_2ND_ARCH_VAR_PREFIX)PREBUILT_LIBCXX_ARCH_DIR)
+    my_ndk_stl_include_path := \
+      $(my_ndk_source_root)/cxx-stl/llvm-libc++/include
+    my_ndk_stl_include_path += \
+      $(my_ndk_source_root)/cxx-stl/llvm-libc++abi/include
 
-    # Include the target-specific __config_site file followed by the generic libc++ headers.
-    my_ndk_stl_include_path := $(my_libcxx_arch_dir)/include/c++/v1
-    my_ndk_stl_include_path += $(my_llvm_dir)/include/c++/v1
-    my_libcxx_libdir := $(my_libcxx_arch_dir)/lib
+    my_libcxx_libdir := \
+      $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(my_cpu_variant)
 
     ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT))
       my_ndk_stl_static_lib := \
@@ -258,7 +258,7 @@
       my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so
     endif
 
-    my_ndk_stl_static_lib += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LIBUNWIND)
+    my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a
     my_ldlibs += -ldl
   else # LOCAL_NDK_STL_VARIANT must be none
     # Do nothing.