From 57ce3212257513bd2cdcb5af89cb85476a39701b Mon Sep 17 00:00:00 2001 From: Imanol Fernandez Date: Mon, 19 Nov 2018 20:29:48 +0100 Subject: [PATCH] Revert "Updated namespaces for jetpack androidx (#52)" This reverts commit ae721d1aa1cf1d6fbdce4481d65674e19597688e. --- android/java/org/mozilla/vrb/ImageLoader.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/android/java/org/mozilla/vrb/ImageLoader.java b/android/java/org/mozilla/vrb/ImageLoader.java index 2d6d362..179d1e5 100644 --- a/android/java/org/mozilla/vrb/ImageLoader.java +++ b/android/java/org/mozilla/vrb/ImageLoader.java @@ -9,6 +9,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.opengl.ETC1; +import android.support.annotation.Keep; import org.mozilla.vrb.etc2.UtilETC2; @@ -19,9 +20,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; -import androidx.annotation.Keep; - -import static android.opengl.GLES30.GL_RGBA; +import static android.opengl.GLES30.*; class ImageLoader {