Initial commitHEADmaster

12 files changed, 305 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..cbb84e8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/bin/
+/gen/
+/libs/
+*.keystore
+local.properties
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..57ac2bb
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="tk.oxore.NativeArmv6"
+        android:versionCode="1"
+        android:versionName="1.0"
+        android:minSdkVersion="1"
+        >
+    <application android:label="@string/app_name" >
+        <activity android:name="DummyAct"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
diff --git a/ant.properties b/ant.properties
new file mode 100644
index 0000000..a90087c
--- /dev/null
+++ b/ant.properties
@@ -0,0 +1,21 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+key.store=./mykey.keystore
+key.alias=mykeyname
+key.store.password=password
+key.alias.password=password
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..d02f49c
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="NativeArmv6" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/jni/Android.mk b/jni/Android.mk
new file mode 100644
index 0000000..dc14b0d
--- /dev/null
+++ b/jni/Android.mk
@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE 		:= hello-jni
+LOCAL_SRC_FILES := hello-jni.c
+LOCAL_LDLIBS    := -llog
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/Application.mk b/jni/Application.mk
new file mode 100644
index 0000000..d60a721
--- /dev/null
+++ b/jni/Application.mk
@@ -0,0 +1 @@
+APP_ABI := armeabi
diff --git a/jni/hello-jni.c b/jni/hello-jni.c
new file mode 100644
index 0000000..5b838d7
--- /dev/null
+++ b/jni/hello-jni.c
@@ -0,0 +1,73 @@
+#include <string.h>
+#include <jni.h>
+#include <android/log.h>
+
+#if 1 // Simple JNI Implementation
+JNIEXPORT
+jstring
+JNICALL
+Java_tk_oxore_NativeArmv6_DummyAct_helloJni(JNIEnv* env, jobject thiz)
+{
+    
+    __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "Debug Log");
+    return (*env)->NewStringUTF(env, "Hello Form JNI");
+}
+
+#else // Alternative JNI imlementation
+jstring
+helloJni(JNIEnv* env, jobject thiz)
+{
+    __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "Debug Log");
+    return (*env)->NewStringUTF(env, "Hello Form JNI");
+}
+
+jint
+JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+    __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "Running JNI_OnLoad");
+
+    if (vm == NULL) {
+        __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "vm == NULL");
+        return JNI_ERR;
+    }
+
+    JavaVMAttachArgs args;
+    args.version = JNI_VERSION_1_6; // choose your JNI version
+    args.name = NULL; // you might want to give the java thread a name
+    args.group = NULL; // you might want to assign the java thread to a ThreadGroup
+    JNIEnv* env;
+    if ((*vm)->AttachCurrentThread(vm, &env, &args) != JNI_OK) {
+        __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "GetEnv != JNI_OK");
+        return JNI_ERR;
+    }
+
+    if (env == NULL) {
+        __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "env == NULL");
+        return JNI_ERR;
+    }
+
+    if ((*env)->FindClass == NULL) {
+        __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "No `FindClass` function provided");
+        return JNI_ERR;
+    }
+
+    // Find your class. JNI_OnLoad is called from the correct class loader context for this to work.
+    jclass c = (*env)->FindClass(env, "tk/oxore/NativeArmv6/DummyAct");
+    if (c == NULL) {
+        __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "c == NULL");
+        return JNI_ERR;
+    }
+
+    // Register your class' native methods.
+    static const JNINativeMethod methods[] = {
+        {"helloJni", "()Ljava/lang/String;", (void*)&helloJni},
+    };
+    int rc = (*env)->RegisterNatives(env, c, methods, sizeof(methods)/sizeof(*methods));
+    if (rc != JNI_OK) {
+        __android_log_write(ANDROID_LOG_DEBUG, "HELLOJNI", "rc != JNI_OK");
+        return rc;
+    }
+
+    return JNI_VERSION_1_6;
+}
+#endif
diff --git a/proguard-project.txt b/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/project.properties b/project.properties
new file mode 100644
index 0000000..b7c2081
--- /dev/null
+++ b/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-10
diff --git a/res/layout/main.xml b/res/layout/main.xml
new file mode 100644
index 0000000..e4b3ec5
--- /dev/null
+++ b/res/layout/main.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    <TextView  
+        android:id="@+id/hw"
+        android:layout_width="fill_parent" 
+        android:layout_height="wrap_content" 
+        android:text="Hello World, DummyAct"
+        />
+    <TextView
+        android:id="@+id/sample_text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text=" "
+        />
+</LinearLayout>
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
new file mode 100644
index 0000000..6e66208
--- /dev/null
+++ b/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">NativeArmv6</string>
+</resources>
diff --git a/src/tk/oxore/NativeArmv6/DummyAct.java b/src/tk/oxore/NativeArmv6/DummyAct.java
new file mode 100644
index 0000000..91b5ebf
--- /dev/null
+++ b/src/tk/oxore/NativeArmv6/DummyAct.java
@@ -0,0 +1,29 @@
+package tk.oxore.NativeArmv6;
+
+import android.util.Log;
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class DummyAct extends Activity
+{
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        TextView tv = (TextView) findViewById(R.id.sample_text);
+        try {
+          tv.append(helloJni());
+        } catch (Exception e) {
+          Log.e("AAAAAAAAAAAAAAA", "a");
+        }
+    }
+
+    static {
+      System.loadLibrary("hello-jni");
+    }
+    public native String helloJni();
+}