diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-02 21:15:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 21:15:54 +0100 |
| commit | d8a28368f979f8ebe5c4f218613961b59ca5822d (patch) | |
| tree | 9432b0a27fd05ac0594abf98bdf295c2df7524d5 /platform/android/java_glue.h | |
| parent | f8bb7e0673f8480e86f1ae43441fc529dbfe65c8 (diff) | |
| parent | 6105a8beb1c861574986b7531c6b5c6e7b4cdb42 (diff) | |
Merge pull request #24105 from BastiaanOlij/cleanup_old_android_native
Remove obsolete ANDROID_NATIVE_ACTIVITY
Diffstat (limited to 'platform/android/java_glue.h')
| -rw-r--r-- | platform/android/java_glue.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/platform/android/java_glue.h b/platform/android/java_glue.h index d433b5f0d8..dc5b9cca49 100644 --- a/platform/android/java_glue.h +++ b/platform/android/java_glue.h @@ -28,8 +28,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef ANDROID_NATIVE_ACTIVITY - #ifndef JAVA_GLUE_H #define JAVA_GLUE_H @@ -64,5 +62,4 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv * JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jobject obj, jint p_height); } -#endif #endif // JAVA_GLUE_H |