Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/java/android/org/webrtc/EglBase.java

Index: webrtc/api/java/android/org/webrtc/EglBase.java
diff --git a/webrtc/api/java/android/org/webrtc/EglBase.java b/webrtc/api/java/android/org/webrtc/EglBase.java
deleted file mode 100644
index 05dd8060d45c5edd347100de051010475ab4e41c..0000000000000000000000000000000000000000
--- a/webrtc/api/java/android/org/webrtc/EglBase.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-package org.webrtc;
-
-import android.graphics.SurfaceTexture;
-import android.view.Surface;
-
-import javax.microedition.khronos.egl.EGL10;
-
-
-/**
- * Holds EGL state and utility methods for handling an egl 1.0 EGLContext, an EGLDisplay,
- * and an EGLSurface.
- */
-public abstract class EglBase {
-  // EGL wrapper for an actual EGLContext.
-  public static class Context {
-  }
-
-  // According to the documentation, EGL can be used from multiple threads at the same time if each
-  // thread has its own EGLContext, but in practice it deadlocks on some devices when doing this.
-  // Therefore, synchronize on this global lock before calling dangerous EGL functions that might
-  // deadlock. See https://bugs.chromium.org/p/webrtc/issues/detail?id=5702 for more info.
-  public static final Object lock = new Object();
-
-  // These constants are taken from EGL14.EGL_OPENGL_ES2_BIT and EGL14.EGL_CONTEXT_CLIENT_VERSION.
-  // https://android.googlesource.com/platform/frameworks/base/+/master/opengl/java/android/opengl/EGL14.java
-  // This is similar to how GlSurfaceView does:
-  // http://grepcode.com/file/repository.grepcode.com/java/ext/com.google.android/android/5.1.1_r1/android/opengl/GLSurfaceView.java#760
-  private static final int EGL_OPENGL_ES2_BIT = 4;
-  // Android-specific extension.
-  private static final int EGL_RECORDABLE_ANDROID = 0x3142;
-
-  public static final int[] CONFIG_PLAIN = {
-    EGL10.EGL_RED_SIZE, 8,
-    EGL10.EGL_GREEN_SIZE, 8,
-    EGL10.EGL_BLUE_SIZE, 8,
-    EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL10.EGL_NONE
-  };
-  public static final int[] CONFIG_RGBA = {
-    EGL10.EGL_RED_SIZE, 8,
-    EGL10.EGL_GREEN_SIZE, 8,
-    EGL10.EGL_BLUE_SIZE, 8,
-    EGL10.EGL_ALPHA_SIZE, 8,
-    EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL10.EGL_NONE
-  };
-  public static final int[] CONFIG_PIXEL_BUFFER = {
-    EGL10.EGL_RED_SIZE, 8,
-    EGL10.EGL_GREEN_SIZE, 8,
-    EGL10.EGL_BLUE_SIZE, 8,
-    EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL10.EGL_SURFACE_TYPE, EGL10.EGL_PBUFFER_BIT,
-    EGL10.EGL_NONE
-  };
-  public static final int[] CONFIG_PIXEL_RGBA_BUFFER = {
-    EGL10.EGL_RED_SIZE, 8,
-    EGL10.EGL_GREEN_SIZE, 8,
-    EGL10.EGL_BLUE_SIZE, 8,
-    EGL10.EGL_ALPHA_SIZE, 8,
-    EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL10.EGL_SURFACE_TYPE, EGL10.EGL_PBUFFER_BIT,
-    EGL10.EGL_NONE
-  };
-  public static final int[] CONFIG_RECORDABLE = {
-    EGL10.EGL_RED_SIZE, 8,
-    EGL10.EGL_GREEN_SIZE, 8,
-    EGL10.EGL_BLUE_SIZE, 8,
-    EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL_RECORDABLE_ANDROID, 1,
-    EGL10.EGL_NONE
-  };
-
-  // Create a new context with the specified config attributes, sharing data with sharedContext.
-  // |sharedContext| can be null.
-  public static EglBase create(Context sharedContext, int[] configAttributes) {
-    return (EglBase14.isEGL14Supported()
-        && (sharedContext == null || sharedContext instanceof EglBase14.Context))
-            ? new EglBase14((EglBase14.Context) sharedContext, configAttributes)
-            : new EglBase10((EglBase10.Context) sharedContext, configAttributes);
-  }
-
-  public static EglBase create() {
-    return create(null, CONFIG_PLAIN);
-  }
-
-  public static EglBase create(Context sharedContext) {
-    return create(sharedContext, CONFIG_PLAIN);
-  }
-
-  public abstract void createSurface(Surface surface);
-
-  // Create EGLSurface from the Android SurfaceTexture.
-  public abstract void createSurface(SurfaceTexture surfaceTexture);
-
-  // Create dummy 1x1 pixel buffer surface so the context can be made current.
-  public abstract void createDummyPbufferSurface();
-
-  public abstract void createPbufferSurface(int width, int height);
-
-  public abstract Context getEglBaseContext();
-
-  public abstract boolean hasSurface();
-
-  public abstract int surfaceWidth();
-
-  public abstract int surfaceHeight();
-
-  public abstract void releaseSurface();
-
-  public abstract void release();
-
-  public abstract void makeCurrent();
-
-  // Detach the current EGL context, so that it can be made current on another thread.
-  public abstract void detachCurrent();
-
-  public abstract void swapBuffers();
-}