diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-28 21:32:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-28 21:32:53 +0000 |
| commit | 2be77647d12356ee4ff0ffb5f3c694ec13306103 (patch) | |
| tree | 6876d60d12d727b6434e6d6117275e4c582897be | |
| parent | 99d195985eb3f9b5de83b3cad6bc153de6fbdccb (diff) | |
| parent | 5df61252a95344fc4bf843e8411d028630e8c6b3 (diff) | |
| download | libnativehelper-simpleperf-release.tar.gz | |
Merge "Snap for 11510257 from e322933c80387d34cad2e5fe77155b8a491716f7 to simpleperf-release" into simpleperf-releasesimpleperf-release
| -rw-r--r-- | JniConstants.c | 1 | ||||
| -rw-r--r-- | JniConstants.h | 1 | ||||
| -rw-r--r-- | file_descriptor_jni.c | 2 | ||||
| -rw-r--r-- | tests/Android.bp | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/JniConstants.c b/JniConstants.c index 177298e..792c209 100644 --- a/JniConstants.c +++ b/JniConstants.c @@ -36,6 +36,7 @@ // <Class, method, method-string, signature, is_static> #define JMETHODID_CONSTANTS_LIST(V) \ V(FileDescriptor, init, "<init>", "()V", false) \ + V(FileDescriptor, setInt$, "setInt$", "(I)V", false) \ V(NIOAccess, getBaseArray, "getBaseArray", "(Ljava/nio/Buffer;)Ljava/lang/Object;", true) \ V(NIOAccess, getBaseArrayOffset, "getBaseArrayOffset", "(Ljava/nio/Buffer;)I", true) \ V(NioBuffer, array, "array", "()Ljava/lang/Object;", false) \ diff --git a/JniConstants.h b/JniConstants.h index cb8992d..250f94b 100644 --- a/JniConstants.h +++ b/JniConstants.h @@ -39,6 +39,7 @@ jclass JniConstants_NioBufferClass(JNIEnv* env); // JniConstants.c. // jmethodID JniConstants_FileDescriptor_init(JNIEnv* env); +jmethodID JniConstants_FileDescriptor_setInt$(JNIEnv* env); jmethodID JniConstants_NIOAccess_getBaseArray(JNIEnv* env); jmethodID JniConstants_NIOAccess_getBaseArrayOffset(JNIEnv* env); jmethodID JniConstants_NioBuffer_array(JNIEnv* env); diff --git a/file_descriptor_jni.c b/file_descriptor_jni.c index bfae4af..81ed323 100644 --- a/file_descriptor_jni.c +++ b/file_descriptor_jni.c @@ -43,5 +43,5 @@ JNIEXPORT int AFileDescriptor_getFd(JNIEnv* env, jobject fileDescriptor) { JNIEXPORT void AFileDescriptor_setFd(JNIEnv* env, jobject fileDescriptor, int fd) { EnsureArgumentIsFileDescriptor(env, fileDescriptor); - (*env)->SetIntField(env, fileDescriptor, JniConstants_FileDescriptor_descriptor(env), fd); + (*env)->CallVoidMethod(env, fileDescriptor, JniConstants_FileDescriptor_setInt$(env), fd); } diff --git a/tests/Android.bp b/tests/Android.bp index 99ec108..ca9442d 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -1,6 +1,7 @@ // Build the unit tests. package { + default_team: "trendy_team_art_mainline", // http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // the below license kinds from "libnativehelper_license": |