Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Jerome Blondon
authored and
Jerome Blondon
committed
Mar 7, 2013
1 parent
b06a2cc
commit 858b54e
Showing
27 changed files
with
586 additions
and
448 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,16 @@ | ||
| Products/ | ||
| .DS_Store | ||
| *.swp | ||
| *.o | ||
| *.o.d | ||
| *.class | ||
| *.a | ||
| *.so | ||
| Makefile | ||
| libs/* | ||
| minui3.make | ||
| minui_test.make | ||
| obj/* | ||
| android/NativeTest/bin/* | ||
| android/NativeTest/gen/* | ||
| android/NativeTest/obj/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,22 @@ | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="com.example.native_activity" | ||
| android:versionCode="1" | ||
| android:versionName="1.0"> | ||
| package="com.example.native_activity" | ||
| android:versionCode="1" | ||
| android:versionName="1.0"> | ||
|
|
||
| <!-- This is the platform API where NativeActivity was introduced. --> | ||
| <uses-sdk android:minSdkVersion="9" /> | ||
|
|
||
| <!-- This .apk has no Java code itself, so set hasCode to false. --> | ||
| <application android:label="@string/app_name" android:hasCode="false" android:debuggable="true"> | ||
| <application android:label="@string/app_name" android:hasCode="false"> | ||
|
|
||
| <!-- Our activity is the built-in NativeActivity framework class. | ||
| This will take care of integrating with our NDK code. --> | ||
| <activity android:name="android.app.NativeActivity" | ||
| android:label="@string/app_name" | ||
| android:configChanges="orientation|keyboardHidden"> | ||
| <!-- Tell NativeActivity the name of or .so --> | ||
| <meta-data android:name="android.app.lib_name" | ||
| android:value="my_native_module" /> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
| <activity android:name="android.app.NativeActivity" | ||
| android:label="@string/app_name" | ||
| android:configChanges="orientation|keyboardHidden"> | ||
|
|
||
| </manifest> | ||
| <meta-data android:name="android.app.lib_name" | ||
| android:value="native-activity" /> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
| </manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| resources |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,92 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project name="NativeActivity" 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. --> | ||
| <!-- 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 build.properties file can be created by you and is never touched | ||
| by the 'android' tool. This is the place to change some of the | ||
| default property values used by the Ant rules. | ||
| <!-- 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="build.properties" /> | ||
|
|
||
| <!-- The default.properties file is created and updated by the 'android' | ||
| <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 file is an integral part of the build system for your | ||
| application and should be checked into Version Control Systems. --> | ||
| <property file="default.properties" /> | ||
|
|
||
|
|
||
| <!-- Required pre-setup import --> | ||
| <import file="${sdk.dir}/tools/ant/pre_setup.xml" /> | ||
| 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). | ||
| <!-- extension targets. Uncomment the ones where you want to do custom work | ||
| in between standard targets --> | ||
| <!-- | ||
| <target name="-pre-build"> | ||
| </target> | ||
| <target name="-pre-compile"> | ||
| </target> | ||
| [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}] | ||
| <target name="-post-compile"> | ||
| </target> | ||
| --> | ||
|
|
||
| <!-- Execute the Android Setup task that will setup some properties | ||
| specific to the target, and import the build rules files. | ||
| 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" /> | ||
|
|
||
| The rules file is imported from | ||
| <SDK>/tools/ant/ | ||
| Depending on the project type it can be either: | ||
| - main_rules.xml | ||
| - lib_rules.xml | ||
| - test_rules.xml | ||
| <!-- 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 | ||
| <setup> task. | ||
| <import> task. | ||
| - customize it to your needs. | ||
| - Customize the whole script. | ||
| - Customize the whole content of build.xml | ||
| - copy/paste the content of the rules files (minus the top node) | ||
| into this file, *after* the <setup> task | ||
| - disable the import of the rules by changing the setup task | ||
| below to <setup import="false" />. | ||
| 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" | ||
| --> | ||
| <setup /> | ||
| <!-- version-tag: 1 --> | ||
| <import file="${sdk.dir}/tools/ant/build.xml" /> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project name="NativeActivity" 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 build.properties file can be created by you and is never touched | ||
| by the 'android' tool. This is the place to change some of the | ||
| default property values used by the Ant rules. | ||
| 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'. | ||
| 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="build.properties" /> | ||
|
|
||
| <!-- The default.properties file is created and updated by the 'android' | ||
| tool, as well as ADT. | ||
| This file is an integral part of the build system for your | ||
| application and should be checked into Version Control Systems. --> | ||
| <property file="default.properties" /> | ||
|
|
||
|
|
||
| <!-- Required pre-setup import --> | ||
| <import file="${sdk.dir}/tools/ant/pre_setup.xml" /> | ||
|
|
||
|
|
||
| <!-- extension targets. Uncomment the ones where you want to do custom work | ||
| in between standard targets --> | ||
| <!-- | ||
| <target name="-pre-build"> | ||
| </target> | ||
| <target name="-pre-compile"> | ||
| </target> | ||
| [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}] | ||
| <target name="-post-compile"> | ||
| </target> | ||
| --> | ||
|
|
||
| <!-- Execute the Android Setup task that will setup some properties | ||
| specific to the target, and import the build rules files. | ||
| The rules file is imported from | ||
| <SDK>/tools/ant/ | ||
| Depending on the project type it can be either: | ||
| - main_rules.xml | ||
| - lib_rules.xml | ||
| - test_rules.xml | ||
| To customize existing targets, there are two options: | ||
| - Customize only one target: | ||
| - copy/paste the target into this file, *before* the | ||
| <setup> task. | ||
| - customize it to your needs. | ||
| - Customize the whole script. | ||
| - copy/paste the content of the rules files (minus the top node) | ||
| into this file, *after* the <setup> task | ||
| - disable the import of the rules by changing the setup task | ||
| below to <setup import="false" />. | ||
| - customize to your needs. | ||
| --> | ||
| <setup /> | ||
|
|
||
| </project> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| set solib-search-path ./obj/local/armeabi | ||
| directory /home/jerome/android-ndk-r8d/platforms/android-9/arch-arm/usr/include /home/jerome/android-ndk-r8d/sources/android/native_app_glue /home/jerome/nui/nui3/android/NativeTest/../..//deps/libcss/jni/../include /home/jerome/nui/nui3/android/NativeTest/../..//deps/libcss/jni/../src /home/jerome/nui/nui3/android/NativeTest/../..//deps/libcss/jni/../src/libparserutils /home/jerome/nui/nui3/android/NativeTest/../..//deps/libcss/jni/../src/libwapcaplet /home/jerome/nui/nui3/android/NativeTest/../..//deps/expat/jni/../lib /home/jerome/nui/nui3/android/NativeTest/../..//deps/freetype2/jni/../../freetype-overlay/include /home/jerome/nui/nui3/android/NativeTest/../..//deps/freetype2/jni/../include /home/jerome/android-ndk-r8d/sources/cxx-stl/gnu-libstdc++ /home/jerome/nui/nui3/android/NativeTest/../..//deps/harfbuzz/jni/.. /home/jerome/nui/nui3/android/NativeTest/../..//deps/harfbuzz/jni/../../freetype2/include /home/jerome/android-ndk-r8d/sources/cxx-stl/gnu-libstdc++/4.6/include /home/jerome/android-ndk-r8d/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include /home/jerome/nui/nui3/android/NativeTest/../..//deps/libjpeg/jni/.. /home/jerome/nui/nui3/android/NativeTest/../..//deps/mpg123/jni/.. /home/jerome/nui/nui3/android/NativeTest/../..//jni/.. /home/jerome/nui/nui3/android/NativeTest/../..//jni/../include /home/jerome/nui/nui3/android/NativeTest/../..//jni/../src/Stream/Zip /home/jerome/nui/nui3/android/NativeTest/../..//jni/../src/Text/HTML /home/jerome/nui/nui3/android/NativeTest/../..//jni/../src/Application/Unix /home/jerome/nui/nui3/android/NativeTest/../..//jni/../deps /home/jerome/nui/nui3/android/NativeTest/../..//deps/glu/libtess/jni/../.. /home/jerome/nui/nui3/android/NativeTest/../..//deps/libpng/jni/.. /home/jerome/nui/nui3/android/NativeTest/../..//deps/tidy/jni/.. /home/jerome/nui/nui3/android/NativeTest/../..//deps/ucdata/jni/.. /home/jerome/nui/nui3/android/NativeTest/../..//deps/ungif/jni/.. |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 *; | ||
| #} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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-17 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| audio/test.mp3 NUI_RESOURCE "resources/audio/test.mp3" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| audio/test.mp3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.