From 635a3324de4c20be4214e23c0424f739c3056866 Mon Sep 17 00:00:00 2001
From: "Damian @mba" <damian@frey.NOSPAMco.nz>
Date: Wed, 23 Nov 2011 01:29:59 +0100
Subject: [PATCH] finally working

---
 build.xml                                     |  72 ++++++++++--------
 libs/armeabi-v7a/gdb.setup                    |  10 +--
 libs/armeabi-v7a/gdbserver                    | Bin 125208 -> 125208 bytes
 project.properties                            |   2 +-
 .../openframeworks/OFAndroidGoogleMaps.java   |   2 +-
 .../OFActivity.java                           |   0
 6 files changed, 46 insertions(+), 40 deletions(-)
 rename srcJava/cc/openframeworks/{androidFerns => TheArtvertiserAndroid}/OFActivity.java (100%)

diff --git a/build.xml b/build.xml
index d503270..a219d91 100644
--- a/build.xml
+++ b/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>
diff --git a/libs/armeabi-v7a/gdb.setup b/libs/armeabi-v7a/gdb.setup
index 660b1f4..7e8937f 100644
--- a/libs/armeabi-v7a/gdb.setup
+++ b/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
 
diff --git a/libs/armeabi-v7a/gdbserver b/libs/armeabi-v7a/gdbserver
index 39634a8147c5e0ba17fb8b4e916916695edef4ba..2476e3cf9da9568d50911a5bfd7400322d03a33e 100755
GIT binary patch
delta 2068
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

delta 2068
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

diff --git a/project.properties b/project.properties
index c4e5ddc..2153de5 100644
--- a/project.properties
+++ b/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
diff --git a/srcJava/cc/openframeworks/OFAndroidGoogleMaps.java b/srcJava/cc/openframeworks/OFAndroidGoogleMaps.java
index 60db12e..95fe074 100644
--- a/srcJava/cc/openframeworks/OFAndroidGoogleMaps.java
+++ b/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;
diff --git a/srcJava/cc/openframeworks/androidFerns/OFActivity.java b/srcJava/cc/openframeworks/TheArtvertiserAndroid/OFActivity.java
similarity index 100%
rename from srcJava/cc/openframeworks/androidFerns/OFActivity.java
rename to srcJava/cc/openframeworks/TheArtvertiserAndroid/OFActivity.java