Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71d44fb7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "core/jni: Fix Clang unused variable warnings" into main

parents 199fc103 306672f0

core/jni/android_os_PerfettoTrackEventExtra.cpp

+0 −2
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ public: 
        const size_t next_offset = current_offset + len + 1;

        // Fast path: Enough space in char_buffer

        if (BASE_SIZE > next_offset) {

            const size_t start_offset = current_offset;



            copy_utf16_to_ascii(temp_buffer, len, char_buffer + current_offset, env, val);

            char_buffer[current_offset + len] = '\0';

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

+0 −2
Original line number Diff line number Diff line
@@ -284,7 +284,6 @@ static install_status_t copyFileIfChanged(JNIEnv* env, void* arg, ZipFileRO* zip 
    jboolean debuggable = *(jboolean*)args[2];

    jboolean app_compat_16kb = *(jboolean*)args[3];

    jboolean pageSizeCompatDisabled = *(jboolean*)args[4];

    install_status_t ret = INSTALL_SUCCEEDED;



    ScopedUtfChars nativeLibPath(env, *javaNativeLibPath);
@@ -719,7 +718,6 @@ static jint checkAlignment(JNIEnv* env, jstring javaNativeLibPath, jboolean extr 
    int mode = PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED;

    // Need two separate install status for APK and ELF alignment

    static const size_t kPageSize16Kb = 16384;

    jint ret = INSTALL_SUCCEEDED;



    ScopedUtfChars nativeLibPath(env, javaNativeLibPath);

    if (extractNativeLibs) {