merge in nyc-release history after reset to master
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ef51cc..cc52371 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,9 @@
* Removed sed.
* Removed mclinker.
* Removed Perl.
+ * Removed symbols which are not exported by the current platform libc/m/dl from
+ all versions of NDK libc/m/dl
+ * libc/m/dl provide versioned symbols starting with v21
Binutils
--------
diff --git a/build/core/init.mk b/build/core/init.mk
index cec6b03..2d30cac 100644
--- a/build/core/init.mk
+++ b/build/core/init.mk
@@ -306,7 +306,7 @@
$(call ndk_log,HOST_TAG set to $(HOST_TAG))
# Check for NDK-specific versions of our host tools
-HOST_TOOLS_ROOT := $(NDK_ROOT)/host-tools
+HOST_TOOLS_ROOT := $(NDK_ROOT)/prebuilt/$(HOST_TAG64)
HOST_PREBUILT := $(strip $(wildcard $(HOST_TOOLS_ROOT)/bin))
HOST_AWK := $(strip $(NDK_HOST_AWK))
HOST_MAKE := $(strip $(NDK_HOST_MAKE))
diff --git a/tests/build/b14811006-GOT_PREL-optimization/test_config.py b/tests/build/b14811006-GOT_PREL-optimization/test_config.py
index a2f481b..133f960 100644
--- a/tests/build/b14811006-GOT_PREL-optimization/test_config.py
+++ b/tests/build/b14811006-GOT_PREL-optimization/test_config.py
@@ -1,4 +1,5 @@
def match_broken(abi, platform, toolchain, subtest=None):
if toolchain == 'clang':
- return toolchain, 'http://b/26031639'
+ if abi.startswith('armeabi'):
+ return ' '.join([toolchain, abi]), 'http://b/26031639'
return None, None
diff --git a/tests/build/mips-fp4/test_config.py b/tests/build/mips-fp4/test_config.py
index 0ca98e1..c9dceb3 100644
--- a/tests/build/mips-fp4/test_config.py
+++ b/tests/build/mips-fp4/test_config.py
@@ -2,3 +2,9 @@
if abi != 'mips':
return abi
return None
+
+
+def match_broken(abi, platform, toolchain, subtest=None):
+ if toolchain == 'clang':
+ return toolchain, 'http://b/26984979'
+ return None, None
diff --git a/tests/device/test-googletest-full/test_config.py b/tests/device/test-googletest-full/test_config.py
index a7d94c5..0358780 100644
--- a/tests/device/test-googletest-full/test_config.py
+++ b/tests/device/test-googletest-full/test_config.py
@@ -1,4 +1,4 @@
def match_broken(abi, platform, device_platform, toolchain, subtest=None):
- if abi != 'arm64-v8a':
+ if abi in ('x86', 'x86_64'):
return abi, 'http://b/24380035'
return None, None
