diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-22 21:00:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-06-22 21:00:49 +0000 |
| commit | eec23917206051847881e89d23d24ec84fd9441f (patch) | |
| tree | ef7934151e4eaae1f3bb6c11a635faeecda0a4cf | |
| parent | 2d22e378f89c054640e0ead94434c9820e754e10 (diff) | |
| parent | 0ba86a55c51daa8d19cafbcfaefd8615f1c4e47d (diff) | |
| download | ndk-eec23917206051847881e89d23d24ec84fd9441f.tar.gz | |
Merge "Merge cherrypicks of ['android-review.googlesource.com/2597434', 'android-review.googlesource.com/2634070', 'android-review.googlesource.com/2636316'] into ndk-r26-release." into ndk-r26-releasendk-r26-beta1
6 files changed, 13 insertions, 19 deletions
diff --git a/build/core/sanitizers.mk b/build/core/sanitizers.mk index 9e03492d7..0967ee609 100644 --- a/build/core/sanitizers.mk +++ b/build/core/sanitizers.mk @@ -47,3 +47,11 @@ ifneq (,$(filter address,$(NDK_SANITIZERS))) NDK_APP_WRAP_SH_$(TARGET_ARCH_ABI) := $(NDK_ROOT)/wrap.sh/asan.sh endif endif + +# If the user has not specified their own wrap.sh and is using HWASAN, install a +# default HWASAN wrap.sh for them. +ifneq (,$(filter hwaddress,$(NDK_SANITIZERS))) + ifeq ($(NDK_NO_USER_WRAP_SH),true) + NDK_APP_WRAP_SH_$(TARGET_ARCH_ABI) := $(NDK_ROOT)/wrap.sh/hwasan.sh + endif +endif diff --git a/ndk/config.py b/ndk/config.py index 0e3d80e25..614279d8d 100644 --- a/ndk/config.py +++ b/ndk/config.py @@ -1,11 +1,11 @@ from __future__ import print_function -major = 27 +major = 26 hotfix = 0 hotfix_str = chr(ord("a") + hotfix) if hotfix else "" -beta = 0 +beta = 1 beta_str = "-beta{}".format(beta) if beta > 0 else "" -canary = True +canary = False canary_str = "-canary" if canary else "" release = "r{}{}{}{}".format(major, hotfix_str, beta_str, canary_str) if __name__ == "__main__": diff --git a/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/Android.mk b/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/Android.mk deleted file mode 100644 index 60ed9e21a..000000000 --- a/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/Android.mk +++ /dev/null @@ -1,7 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE -LOCAL_SRC_FILES := issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE.c -LOCAL_LDLIBS += -lOpenSLES -include $(BUILD_SHARED_LIBRARY) diff --git a/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/Application.mk b/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/Application.mk deleted file mode 100644 index e3af5f47c..000000000 --- a/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/Application.mk +++ /dev/null @@ -1,2 +0,0 @@ -APP_ABI := all -APP_PLATFORM := android-14
\ No newline at end of file diff --git a/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE.c b/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE.c deleted file mode 100644 index f20eb46c9..000000000 --- a/tests/build/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE/jni/issue40625-SL_IID_ANDROIDBUFFERQUEUESOURCE.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <SLES/OpenSLES.h> -#include <SLES/OpenSLES_Android.h> - -SLInterfaceID foo() -{ - return SL_IID_ANDROIDBUFFERQUEUESOURCE; -} diff --git a/wrap.sh/hwasan.sh b/wrap.sh/hwasan.sh new file mode 100644 index 000000000..88445fce9 --- /dev/null +++ b/wrap.sh/hwasan.sh @@ -0,0 +1,2 @@ +#!/system/bin/sh +LD_HWASAN=1 exec "$@" |