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 | 2b689ca10ff7add15ce9ff70a629141969f9b675 (patch) | |
| tree | 433f9ffd787bfea8d4c9f9eb13f0c5f61f29c30e | |
| parent | bf9fd0f6648a6cc43a9bd703073705110a549243 (diff) | |
| parent | 18ed97de9f4f672d96f8539e3ab6ee1e9462de2a (diff) | |
| download | gamesdk-2b689ca10ff7add15ce9ff70a629141969f9b675.tar.gz | |
Merge cherrypicks of ['android-review.googlesource.com/2962714', 'android-review.googlesource.com/2962715'] into android-games-sdk-game-text-input-release.
Change-Id: I1835bcdeca0214ac38d2480aad18823283da99c3
| -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 1503e75c..6a092ea6 100644 --- a/games-memory-advice/CMakeLists.txt +++ b/games-memory-advice/CMakeLists.txt @@ -95,7 +95,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 |