(Android) Rename android_glue.h into frontend_android.h and move it

android/native/jni/input_android.c

@@ -16,8 +16,8 @@
 
 #include <android/keycodes.h>
 #include <unistd.h>
-#include "android_glue.h"
 #include "input_autodetect.h"
+#include "../../../frontend/frontend_android.h"
 #include "../../../input/input_common.h"
 #include "../../../performance.h"
 #include "../../../general.h"

android/native/jni/input_autodetect.c

@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "android_glue.h"
+#include "../../../frontend/frontend_android.h"
 #include "jni_macros.h"
 #include "input_autodetect.h"
 

frontend/frontend_android.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <sys/resource.h>
 
-#include "../android/native/jni/android_glue.h"
+#include "frontend_android.h"
 #include "../android/native/jni/jni_macros.h"
 #include "../general.h"
 #include "../performance.h"

frontend/frontend_android.h

@@ -1,22 +1,21 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2013 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
  *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _ANDROID_NATIVE_APP_GLUE_H
-#define _ANDROID_NATIVE_APP_GLUE_H
+#ifndef _FRONTEND_ANDROID_H
+#define _FRONTEND_ANDROID_H
 
 #include <poll.h>
 #include <pthread.h>
@@ -160,4 +159,4 @@ extern void engine_handle_cmd (void *data, int32_t cmd);
 
 extern struct android_app *g_android;
 
-#endif /* _ANDROID_NATIVE_APP_GLUE_H */
+#endif /* _FRONTEND_ANDROID_H */

gfx/context/androidegl_ctx.c

@@ -20,7 +20,7 @@
 
 #include <EGL/egl.h> /* Requires NDK r5 or newer */
 
-#include "../../android/native/jni/android_glue.h"
+#include "../../frontend/frontend_android.h"
 #include "../image.h"
 
 #include "../fonts/gl_font.h"