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

Commit a3a0f2f3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add another pragma to disable another bunch of warnings." into main

parents f44d068f 5362e820
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ mkdir out

mkdir -p out/javax/microedition/khronos/opengles
mkdir -p out/com/google/android/gles_jni
mkdir -p out/android/annotation
mkdir -p out/android/app
mkdir -p out/android/graphics
mkdir -p out/android/hardware
mkdir -p out/android/view
mkdir -p out/android/opengl
mkdir -p out/android/content
@@ -34,18 +36,20 @@ mkdir -p out/android/util
echo "package android.graphics;" > out/android/graphics/Canvas.java
echo "public interface Canvas {}" >> out/android/graphics/Canvas.java

echo "package android.annotation; public @interface NonNull {}" > out/android/annotation/NonNull.java
echo "package android.app; import android.content.pm.IPackageManager; public class AppGlobals { public static IPackageManager getPackageManager() { return null;} }" > out/android/app/AppGlobals.java
# echo "package android.content; import android.content.pm.PackageManager; public interface Context { public PackageManager getPackageManager(); }" > out/android/content/Context.java
echo "package android.content.pm; public class ApplicationInfo {public int targetSdkVersion;}" > out/android/content/pm/ApplicationInfo.java
echo "package android.content.pm; public interface IPackageManager {ApplicationInfo getApplicationInfo(java.lang.String packageName, int flags, java.lang.String userId) throws android.os.RemoteException;}" > out/android/content/pm/IPackageManager.java
echo "package android.os; public class Build {public static class VERSION_CODES { public static final int CUPCAKE = 3;};	}" > out/android/os/Build.java
echo "package android.hardware; import android.os.ParcelFileDescriptor; public class SyncFence { public static SyncFence create(ParcelFileDescriptor w) { return null; } public static SyncFence createEmpty() { return null; } }" > out/android/hardware/SyncFence.java
echo "package android.os; public class Build {public static class VERSION_CODES { public static final int CUPCAKE = 0; public static final int R = 0; }; }" > out/android/os/Build.java
echo "package android.os; public class ParcelFileDescriptor { public static ParcelFileDescriptor adoptFd(int fd) { return null; } }" > out/android/os/ParcelFileDescriptor.java
echo "package android.os; public class UserHandle {public static String myUserId() { return \"\"; } }" > out/android/os/UserHandle.java
echo "package android.os; public class RemoteException extends Exception {}" > out/android/os/RemoteException.java
echo "package android.util; public class Log {public static void w(String a, String b) {} public static void e(String a, String b) {}}" > out/android/util/Log.java
echo "package android.util; public class Log {public static void d(String a, String b) {} public static void w(String a, String b) {} public static void e(String a, String b) {}}" > out/android/util/Log.java

echo "package android.opengl; public abstract class EGLObjectHandle { public int getHandle() { return 0; } }" > out/android/opengl/EGLObjectHandle.java


echo "package android.graphics;" > out/android/graphics/SurfaceTexture.java
echo "public interface SurfaceTexture {}" >> out/android/graphics/SurfaceTexture.java
echo "package android.view;" > out/android/view/SurfaceView.java
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package android.opengl;

import android.compat.annotation.UnsupportedAppUsage;
import android.graphics.SurfaceTexture;
import android.os.Build;
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
// This source file is automatically generated

#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"

#include "jni.h"
+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
// This source file is automatically generated

#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wunused-function"

#include "jni.h"
+41 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@

package android.opengl;

import android.annotation.NonNull;
import android.hardware.SyncFence;
import android.os.ParcelFileDescriptor;
import android.util.Log;

/**
 * EGL Extensions
 */
@@ -30,8 +35,44 @@ public class EGLExt {
    public static final int EGL_OPENGL_ES3_BIT_KHR          = 0x0040;
    public static final int EGL_RECORDABLE_ANDROID          = 0x3142;

    // EGL_ANDROID_native_fence_sync
    public static final int EGL_SYNC_NATIVE_FENCE_ANDROID     = 0x3144;
    public static final int EGL_SYNC_NATIVE_FENCE_FD_ANDROID  = 0x3145;
    public static final int EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID = 0x3146;
    public static final int EGL_NO_NATIVE_FENCE_FD_ANDROID    = -1;

    native private static void _nativeClassInit();
    static {
        _nativeClassInit();
    }

    /**
     * Retrieves the SyncFence for an EGLSync created with EGL_SYNC_NATIVE_FENCE_ANDROID
     *
     * See <a href="https://www.khronos.org/registry/EGL/extensions/ANDROID/EGL_ANDROID_native_fence_sync.txt">
     *     EGL_ANDROID_native_fence_sync</a> extension for more details
     * @param display The EGLDisplay connection
     * @param sync The EGLSync to fetch the SyncFence from
     * @return A SyncFence representing the native fence.
     *       * If <sync> is not a valid sync object for <display>,
     *         an {@link SyncFence#isValid() invalid} SyncFence is returned and an EGL_BAD_PARAMETER
     *         error is generated.
     *       * If the EGL_SYNC_NATIVE_FENCE_FD_ANDROID attribute of <sync> is
     *         EGL_NO_NATIVE_FENCE_FD_ANDROID, an {@link SyncFence#isValid() invalid} SyncFence is
     *         returned and an EGL_BAD_PARAMETER error is generated.
     *       * If <display> does not match the display passed to eglCreateSync
     *         when <sync> was created, the behaviour is undefined.
     */
    public static @NonNull SyncFence eglDupNativeFenceFDANDROID(@NonNull EGLDisplay display,
            @NonNull EGLSync sync) {
        int fd = eglDupNativeFenceFDANDROIDImpl(display, sync);
        Log.d("EGL", "eglDupNativeFence returned " + fd);
        if (fd >= 0) {
            return SyncFence.create(ParcelFileDescriptor.adoptFd(fd));
        } else {
            return SyncFence.createEmpty();
        }
    }

    private static native int eglDupNativeFenceFDANDROIDImpl(EGLDisplay display, EGLSync sync);
Loading