diff options
| author | Dan Albert <danalbert@google.com> | 2018-08-28 14:54:14 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2018-09-27 16:30:22 -0700 |
| commit | 8afb627a222005272e61d4b222b50c69e760d77d (patch) | |
| tree | bd2bb27bf894743c08e463f80492e285a92aa92a /sources | |
| parent | dbb35a4da97c5aa2a577f6c8bba36e50359c2ed7 (diff) | |
| download | ndk-8afb627a222005272e61d4b222b50c69e760d77d.tar.gz | |
Update ndk-build to use the new toolchain layout.
Test: ./checkbuild.py && ./run_tests.py
Bug: https://github.com/android-ndk/ndk/issues/780
Change-Id: Iaf4f20e97b173d463c7b4367903466fe8dc5cf64
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/android/support/Android.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sources/android/support/Android.mk b/sources/android/support/Android.mk index 1770c49d4..d4728a59c 100644 --- a/sources/android/support/Android.mk +++ b/sources/android/support/Android.mk @@ -3,8 +3,6 @@ LOCAL_PATH := $(call my-dir) # libandroid_support is only needed on LP32. ifeq ($(filter $(NDK_KNOWN_DEVICE_ABI64S),$(TARGET_ARCH_ABI)),) -android_support_export_c_includes := $(LOCAL_PATH)/include - ifneq ($(LIBCXX_FORCE_REBUILD),true) # Using prebuilt LIBCXX_LIBS := ../../cxx-stl/llvm-libc++/libs/$(TARGET_ARCH_ABI) @@ -12,21 +10,17 @@ LIBCXX_LIBS := ../../cxx-stl/llvm-libc++/libs/$(TARGET_ARCH_ABI) include $(CLEAR_VARS) LOCAL_MODULE := android_support LOCAL_SRC_FILES := $(LIBCXX_LIBS)/lib$(LOCAL_MODULE)$(TARGET_LIB_EXTENSION) -LOCAL_EXPORT_C_INCLUDES := $(android_support_export_c_includes) include $(PREBUILT_STATIC_LIBRARY) else # Building -android_support_c_includes := $(android_support_export_c_includes) android_support_cflags := \ -Drestrict=__restrict__ \ -ffunction-sections \ -fdata-sections \ -fvisibility=hidden \ -# 32-bit ABIs - -android_support_c_includes += \ +android_support_c_includes := \ $(BIONIC_PATH)/libc \ $(BIONIC_PATH)/libc/upstream-openbsd/android/include \ $(BIONIC_PATH)/libm \ @@ -129,8 +123,6 @@ LOCAL_CPPFLAGS := \ -fvisibility-inlines-hidden \ -std=c++11 \ -LOCAL_EXPORT_C_INCLUDES := $(android_support_export_c_includes) - include $(BUILD_STATIC_LIBRARY) endif # Prebuilt/building |