Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

finally working

  • Loading branch information...
commit 635a3324de4c20be4214e23c0424f739c3056866 1 parent 1e73a05
Damian @mba authored
View
72 build.xml
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="OFActivity" 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.
+ <!-- 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. -->
+ <loadproperties srcFile="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
@@ -17,6 +16,9 @@
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.
@@ -24,17 +26,24 @@
application and should be checked into Version Control Systems.
-->
- <property file="build.properties" />
+ <property file="ant.properties" />
- <!-- The default.properties file is created and updated by the 'android'
+ <!-- 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. -->
- <property file="default.properties" />
+ <loadproperties srcFile="project.properties" />
-
- <!-- Required pre-setup import -->
- <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
+ <!-- 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
@@ -45,35 +54,32 @@
<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}]
+ /* 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
+ <!-- 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>
View
10 libs/armeabi-v7a/gdb.setup
@@ -1,6 +1,6 @@
-set solib-search-path /home/arturo/Escritorio/openFrameworks/apps/artvertiser/androidFerns/obj/local/armeabi-v7a:/home/arturo/Escritorio/openFrameworks/apps/artvertiser/androidFerns/libs/armeabi-v7a
-directory /home/arturo/Descargas/android-ndk-r6/platforms/android-8/arch-arm/usr/include
-directory /home/arturo/Escritorio/openFrameworks/apps/artvertiser/androidFerns/src
-directory /home/arturo/Descargas/android-ndk-r6/sources/cxx-stl/system
-directory /home/arturo/Escritorio/openFrameworks/apps/artvertiser/androidFerns/libs/armeabi-v7a
+set solib-search-path /Users/damian/code/ofgit/apps/artvertiser/TheArtvertiserAndroid/obj/local/armeabi-v7a:/Users/damian/code/ofgit/apps/artvertiser/TheArtvertiserAndroid/libs/armeabi-v7a
+directory /Users/damian/code/android/android-ndk-r6b/platforms/android-8/arch-arm/usr/include
+directory /Users/damian/code/ofgit/apps/artvertiser/TheArtvertiserAndroid/src
+directory /Users/damian/code/android/android-ndk-r6b/sources/cxx-stl/system
+directory /Users/damian/code/ofgit/apps/artvertiser/TheArtvertiserAndroid/libs/armeabi-v7a
View
BIN  libs/armeabi-v7a/gdbserver
Binary file not shown
View
2  project.properties
@@ -7,7 +7,7 @@
# "ant.properties", and override values to adapt the script to your
# project structure.
-android.library.reference.1=../../../addons/ofxAndroid/ofAndroidLib/
+android.library.reference.1=../../../addons/ofxAndroid/ofAndroidLib
# Project target.
target=Google Inc.:Google APIs:8
android.library.reference.1=../../../addons/ofxAndroid/ofAndroidLib
View
2  srcJava/cc/openframeworks/OFAndroidGoogleMaps.java
@@ -8,7 +8,7 @@
import android.util.Log;
import android.view.View;
import android.view.ViewGroup.MarginLayoutParams;
-import cc.openframeworks.androidFerns.R;
+import cc.openframeworks.TheArtvertiserAndroid.R;
import com.google.android.maps.GeoPoint;
import com.google.android.maps.MapView;
View
0  ...enframeworks/androidFerns/OFActivity.java → ...rks/TheArtvertiserAndroid/OFActivity.java
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.