From 82de179f7dfed86acf1810fa9e7c95e383e78e8d Mon Sep 17 00:00:00 2001
From: magjed <magjed@webrtc.org>
Date: Tue, 25 Apr 2017 05:32:07 -0700
Subject: [PATCH] Android: Move EglBase10/EglBase14 from to API to src

BUG=webrtc:7172

Review-Url: https://codereview.webrtc.org/2831603002
Cr-Commit-Position: refs/heads/master@{#17864}
---
 webrtc/sdk/android/BUILD.gn                                | 4 ++--
 .../android/{api => src/java}/org/webrtc/EglBase10.java    | 2 +-
 .../android/{api => src/java}/org/webrtc/EglBase14.java    | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename webrtc/sdk/android/{api => src/java}/org/webrtc/EglBase10.java (99%)
 rename webrtc/sdk/android/{api => src/java}/org/webrtc/EglBase14.java (97%)

diff --git a/webrtc/sdk/android/BUILD.gn b/webrtc/sdk/android/BUILD.gn
index c3a20d763e..9fcedf907b 100644
--- a/webrtc/sdk/android/BUILD.gn
+++ b/webrtc/sdk/android/BUILD.gn
@@ -157,8 +157,6 @@ android_library("libjingle_peerconnection_java") {
     "api/org/webrtc/DataChannel.java",
     "api/org/webrtc/DtmfSender.java",
     "api/org/webrtc/EglBase.java",
-    "api/org/webrtc/EglBase10.java",
-    "api/org/webrtc/EglBase14.java",
     "api/org/webrtc/EglRenderer.java",
     "api/org/webrtc/FileVideoCapturer.java",
     "api/org/webrtc/GlRectDrawer.java",
@@ -200,6 +198,8 @@ android_library("libjingle_peerconnection_java") {
     "src/java/org/webrtc/Camera2Session.java",
     "src/java/org/webrtc/CameraCapturer.java",
     "src/java/org/webrtc/CameraSession.java",
+    "src/java/org/webrtc/EglBase10.java",
+    "src/java/org/webrtc/EglBase14.java",
     "src/java/org/webrtc/Histogram.java",
     "src/java/org/webrtc/YuvConverter.java",
   ]
diff --git a/webrtc/sdk/android/api/org/webrtc/EglBase10.java b/webrtc/sdk/android/src/java/org/webrtc/EglBase10.java
similarity index 99%
rename from webrtc/sdk/android/api/org/webrtc/EglBase10.java
rename to webrtc/sdk/android/src/java/org/webrtc/EglBase10.java
index bd99bd4aa3..e42bfaa6fa 100644
--- a/webrtc/sdk/android/api/org/webrtc/EglBase10.java
+++ b/webrtc/sdk/android/src/java/org/webrtc/EglBase10.java
@@ -26,7 +26,7 @@ import javax.microedition.khronos.egl.EGLSurface;
  * Holds EGL state and utility methods for handling an egl 1.0 EGLContext, an EGLDisplay,
  * and an EGLSurface.
  */
-public final class EglBase10 extends EglBase {
+class EglBase10 extends EglBase {
   // This constant is taken from EGL14.EGL_CONTEXT_CLIENT_VERSION.
   private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
 
diff --git a/webrtc/sdk/android/api/org/webrtc/EglBase14.java b/webrtc/sdk/android/src/java/org/webrtc/EglBase14.java
similarity index 97%
rename from webrtc/sdk/android/api/org/webrtc/EglBase14.java
rename to webrtc/sdk/android/src/java/org/webrtc/EglBase14.java
index c87852d473..9fcc536f58 100644
--- a/webrtc/sdk/android/api/org/webrtc/EglBase14.java
+++ b/webrtc/sdk/android/src/java/org/webrtc/EglBase14.java
@@ -25,7 +25,7 @@ import android.view.Surface;
  * and an EGLSurface.
  */
 @TargetApi(18)
-public final class EglBase14 extends EglBase {
+class EglBase14 extends EglBase {
   private static final String TAG = "EglBase14";
   private static final int EGLExt_SDK_VERSION = android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
   private static final int CURRENT_SDK_VERSION = android.os.Build.VERSION.SDK_INT;
@@ -37,8 +37,9 @@ public final class EglBase14 extends EglBase {
   // EGL 1.4 is supported from API 17. But EGLExt that is used for setting presentation
   // time stamp on a surface is supported from 18 so we require 18.
   public static boolean isEGL14Supported() {
-    Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION + ". isEGL14Supported: "
-            + (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION));
+    Logging.d(TAG,
+        "SDK version: " + CURRENT_SDK_VERSION
+            + ". isEGL14Supported: " + (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION));
     return (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION);
   }