Permalink
Please sign in to comment.
Showing
with
106 additions
and 82 deletions.
- +1 −0 ChangeAppSettings.sh
- +70 −52 project/build.xml
- +0 −11 project/default.properties
- +3 −0 project/java/MainActivity.java
- +2 −2 project/jni/application/openttd/AndroidAppSettings.cfg
- +24 −12 project/jni/application/openttd/openttd-trunk-android.patch
- +2 −2 project/jni/application/prefclub/AndroidAppSettings.cfg
- +1 −1 project/jni/application/src
- +3 −2 project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
| @@ -1,67 +1,85 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| -<project name="DemoActivity" default="help"> | ||
| +<project name="MainActivity" 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 in in Version | ||
| - Control Systems. --> | ||
| - <property file="local.properties" /> | ||
| + It contains the path to the SDK. It should *NOT* be checked into | ||
| + Version Control Systems. --> | ||
| + <loadproperties srcFile="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: | ||
| - application.package | ||
| - the name of your application package as defined in the manifest. Used by the | ||
| - 'uninstall' rule. | ||
| source.dir | ||
| - the name of the source directory. Default is 'src'. | ||
| + The name of the source directory. Default is 'src'. | ||
| out.dir | ||
| - the name of the output directory. Default is 'bin'. | ||
| + 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. | ||
| + For other overridable properties, look at the beginning of the rules | ||
| + files in the SDK, at tools/ant/build.xml | ||
| - This file is an integral part of the build system for your application and | ||
| - should be checked in in Version Control Systems. | ||
| + 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 in in Version Control Systems. --> | ||
| - <property file="default.properties" /> | ||
| - | ||
| - <!-- Custom Android task to deal with the project target, and import the proper rules. | ||
| - This requires ant 1.6.0 or above. --> | ||
| - <path id="android.antlibs"> | ||
| - <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> | ||
| - <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" /> | ||
| - <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" /> | ||
| - <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" /> | ||
| - <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" /> | ||
| - </path> | ||
| - | ||
| - <taskdef name="setup" | ||
| - classname="com.android.ant.SetupTask" | ||
| - classpathref="android.antlibs" /> | ||
| - | ||
| - <!-- 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>/platforms/<target_platform>/templates/android_rules.xml | ||
| - | ||
| - To customize some build steps for your project: | ||
| - - copy the content of the main node <project> from android_rules.xml | ||
| - - paste it in this build.xml below the <setup /> task. | ||
| - - disable the import by changing the setup task below to <setup import="false" /> | ||
| - | ||
| - This will ensure that the properties are setup correctly but that your customized | ||
| - build steps are used. | ||
| + <property file="ant.properties" /> | ||
| + | ||
| + <!-- 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'" | ||
| + unless="sdk.dir" | ||
| + /> | ||
| + | ||
| + | ||
| +<!-- 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> | ||
| +--> | ||
| + | ||
| + <!-- 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" | ||
| --> | ||
| - <setup /> | ||
| + <!-- version-tag: 1 --> | ||
| + <import file="${sdk.dir}/tools/ant/build.xml" /> | ||
| </project> |
| @@ -1,11 +0,0 @@ | ||
| -# 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 use, | ||
| -# "build.properties", and override values to adapt the script to your | ||
| -# project structure. | ||
| - | ||
| -# Project target. | ||
| -target=android-12 |
| @@ -1 +1 @@ | ||
| -regression | ||
| +openttd |
0 comments on commit
caab1c0