bootstrap: start native code for the minimal bootstrap. The log message is printed!

tito · tito · commit 2c24341dfb5d · 2014-06-22T12:16:07.000+02:00
diff --git a/bootstrap/common/templates/AndroidManifest.tmpl.xml b/bootstrap/common/templates/AndroidManifest.tmpl.xml
@@ -19,8 +19,8 @@
   <application android:label="@string/appName"
                android:icon="@drawable/icon"
 			   android:hardwareAccelerated="true"
+               android:hasCode="{{ args.bootstrap.hascode|default("true") }}"
                >
-
 	{% for m in args.meta_data %}
 	<meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %}
     <meta-data android:name="fullscreen" android:value="{% if args.window %}0{% else %}1{% endif %}"/>
@@ -36,6 +36,12 @@
               android:windowSoftInputMode="stateAlwaysHidden"
             >
 
+        {% if args.bootstrap.lib_name %}
+        <meta-data android:name="android.app.lib_name"
+                   android:value="{{ args.bootstrap.lib_name }}" />
+        {% endif %}
+
+
       {% if args.launcher %}
       <intent-filter>
         <action android:name="org.renpy.LAUNCH" />
diff --git a/bootstrap/minimal/bootstrap.properties b/bootstrap/minimal/bootstrap.properties
@@ -1 +1,3 @@
-bootstrap.entrypoint=org.renpy.android.PythonActivity
+bootstrap.entrypoint=android.app.NativeActivity
+bootstrap.hascode=false
+bootstrap.lib_name=native-activity
diff --git a/bootstrap/minimal/jni/Android.mk b/bootstrap/minimal/jni/Android.mk
@@ -0,0 +1,26 @@
+# Copyright (C) 2010 The Android Open Source Project
+#
+# 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.
+#
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := native-activity
+LOCAL_SRC_FILES := main.c
+LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv1_CM
+LOCAL_STATIC_LIBRARIES := android_native_app_glue
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,android/native_app_glue)
diff --git a/bootstrap/minimal/jni/Application.mk b/bootstrap/minimal/jni/Application.mk
@@ -0,0 +1 @@
+APP_PLATFORM := android-9
diff --git a/bootstrap/minimal/jni/main.c b/bootstrap/minimal/jni/main.c
@@ -0,0 +1,13 @@
+#include <jni.h>
+#include <errno.h>
+#include <android/log.h>
+#include <android_native_app_glue.h>
+
+#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "native-activity", __VA_ARGS__))
+#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "native-activity", __VA_ARGS__))
+
+
+void android_main(struct android_app* state) {
+    app_dummy();
+	LOGI("android_main: starting minimal bootstrap.");
+}
