diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-27 15:02:23 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-27 15:02:23 +0000 |
| commit | 74103b16cdb772c7f8720ecbec96716e459c2297 (patch) | |
| tree | 93b573331d065f5080a53fc19ce526902c01e86f | |
| parent | f1ebe620d10210d1ec538e250b6066c487a7f42b (diff) | |
| parent | 5303717b30fb04ee7b9ad8b0528a24e815d8f1a5 (diff) | |
| download | gamesdk-snap-temp-L78400030002212615.tar.gz | |
Merge cherrypicks of ['android-review.googlesource.com/2962714', 'android-review.googlesource.com/2962715'] into android-games-sdk-games-controller-release.snap-temp-L78400030002212615snap-temp-L05900030002171678android-games-sdk-games-controller-release
Change-Id: I37c1da4773ac459a30d3940e9479111420f3879a
| -rw-r--r-- | games-memory-advice/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/JNIUtil.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/games-memory-advice/CMakeLists.txt b/games-memory-advice/CMakeLists.txt index 08645aef..368788f3 100644 --- a/games-memory-advice/CMakeLists.txt +++ b/games-memory-advice/CMakeLists.txt @@ -110,7 +110,7 @@ file(APPEND ${mri_file} "end\n") set(output_archive_placeholder_file ${CMAKE_CURRENT_BINARY_DIR}/${output_archive}.placeholder.cpp) add_custom_command(OUTPUT ${output_archive_placeholder_file} - COMMAND touch ${output_archive_placeholder_file} + COMMAND echo > ${output_archive_placeholder_file} DEPENDS memory_advice_static_pre) diff --git a/src/common/JNIUtil.h b/src/common/JNIUtil.h index 702e24d0..2907eba6 100644 --- a/src/common/JNIUtil.h +++ b/src/common/JNIUtil.h @@ -24,6 +24,7 @@ #include <string> #include "Log.h" +#include "system_utils.h" // The code in this file will dynamically load Java classes from a binary // resource linked to the library. The binary data is in DEX format, accessible @@ -145,7 +146,9 @@ static jclass loadClass(JNIEnv* env, jobject activity, const char* name, classLoaderObj, loadClass, dexLoaderClassName)); env->DeleteLocalRef(dexLoaderClassName); - if (env->ExceptionCheck() || !imclassloaderClass) { + int sdkVersion = gamesdk::GetSystemPropAsInt("ro.build.version.sdk"); + + if (env->ExceptionCheck() || !imclassloaderClass || sdkVersion < 26) { env->ExceptionClear(); // For older SDK versions <26, where InMemoryDexClassLoader is not // available |