summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2020-03-02 22:08:43 -0800
committerDan Albert <danalbert@google.com>2020-03-02 22:08:43 -0800
commite5cb4ea4f0ee3a23ae4acf3ee61a23ffa17b213b (patch)
tree946885d34e0ef7ceac99dd08db9a44070cbaa406
parentb3fa2e210e7d170015bebeea5f91be358e87ef33 (diff)
downloadlibcxxabi-ndk.tar.gz
Migrate libunwind build to new repo.ndk
This migrates the LLVM libunwind build from external/libunwind_llvm to toolchain/llvm-project. This also updates us to the current(ish) ToT. Test: ndk/checkbuild.py && ndk/run_tests.py Bug: None Change-Id: Ife3f9fb4def79acb53c38de01c51ccaee65bbccf
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index c9d79cb..de402a9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,7 +39,7 @@ libcxxabi_src_files := \
libcxxabi_includes := \
$(LOCAL_PATH)/include \
- $(LOCAL_PATH)/../libunwind_llvm/include \
+ $(LOCAL_PATH)/../../toolchain/llvm-project/libunwind/include \
$(LOCAL_PATH)/../libcxx/include \
libcxxabi_cflags := -D__STDC_FORMAT_MACROS
@@ -98,7 +98,7 @@ endif
include $(BUILD_STATIC_LIBRARY)
$(call import-add-path, $(LOCAL_PATH)/../..)
-$(call import-module, external/libunwind_llvm)
+$(call import-module, toolchain/llvm-project/libunwind)
endif # Prebuilt/building