diff options
author | Narayan Kamath <narayan@google.com> | 2014-10-22 20:44:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-22 20:44:58 +0000 |
commit | 6e93b246d41275ff55dfab2d747cf0d5c60b3652 (patch) | |
tree | 1282897899b185614681727cf49f3351657667ab | |
parent | b50d0cd53f94b0c654e007464ec32396b0cb1aef (diff) | |
parent | 80f227c1f75d753396a6efd6fccfc0c76c93bae4 (diff) | |
download | system_core-6e93b246d41275ff55dfab2d747cf0d5c60b3652.zip system_core-6e93b246d41275ff55dfab2d747cf0d5c60b3652.tar.gz system_core-6e93b246d41275ff55dfab2d747cf0d5c60b3652.tar.bz2 |
am 80f227c1: am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set by the native bridge.
* commit '80f227c1f75d753396a6efd6fccfc0c76c93bae4':
Don't allow SUPPORTED_ABIs to be set by the native bridge.
-rw-r--r-- | libnativebridge/native_bridge.cc | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc index 1eb2d5b..3facedd 100644 --- a/libnativebridge/native_bridge.cc +++ b/libnativebridge/native_bridge.cc @@ -289,46 +289,6 @@ static void SetCpuAbi(JNIEnv* env, jclass build_class, const char* field, const } } -static void SetSupportedAbis(JNIEnv* env, jclass build_class, const char* field, - const char* *values, int32_t value_count) { - if (value_count < 0) { - return; - } - if (values == nullptr && value_count > 0) { - ALOGW("More than zero values expected: %d.", value_count); - return; - } - - jfieldID field_id = env->GetStaticFieldID(build_class, field, "[Ljava/lang/String;"); - if (field_id != nullptr) { - // Create the array. - jobjectArray array = env->NewObjectArray(value_count, env->FindClass("java/lang/String"), - nullptr); - if (array == nullptr) { - env->ExceptionClear(); - ALOGW("Could not create array."); - return; - } - - // Fill the array. - for (int32_t i = 0; i < value_count; i++) { - jstring str = env->NewStringUTF(values[i]); - if (str == nullptr) { - env->ExceptionClear(); - ALOGW("Could not create string %s.", values[i]); - return; - } - - env->SetObjectArrayElement(array, i, str); - } - - env->SetStaticObjectField(build_class, field_id, array); - } else { - env->ExceptionClear(); - ALOGW("Could not find %s field.", field); - } -} - // Set up the environment for the bridged app. static void SetupEnvironment(NativeBridgeCallbacks* callbacks, JNIEnv* env, const char* isa) { // Need a JNIEnv* to do anything. @@ -359,9 +319,6 @@ static void SetupEnvironment(NativeBridgeCallbacks* callbacks, JNIEnv* env, cons if (bclass_id != nullptr) { SetCpuAbi(env, bclass_id, "CPU_ABI", env_values->cpu_abi); SetCpuAbi(env, bclass_id, "CPU_ABI2", env_values->cpu_abi2); - - SetSupportedAbis(env, bclass_id, "SUPPORTED_ABIS", env_values->supported_abis, - env_values->abi_count); } else { // For example in a host test environment. env->ExceptionClear(); |