Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

finally working

  • Loading branch information...
commit 635a3324de4c20be4214e23c0424f739c3056866 1 parent 1e73a05
Damian @mba authored
72 build.xml
... ... @@ -1,15 +1,14 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project name="OFActivity" default="help">
3 3
4   -<!-- The local.properties file is created and updated by the 'android'
5   - tool.
6   - It contains the path to the SDK. It should *NOT* be checked into
7   - Version Control Systems. -->
8   - <property file="local.properties" />
9   -
10   - <!-- The build.properties file can be created by you and is never touched
11   - by the 'android' tool. This is the place to change some of the
12   - default property values used by the Ant rules.
  4 + <!-- The local.properties file is created and updated by the 'android' tool.
  5 + It contains the path to the SDK. It should *NOT* be checked into
  6 + Version Control Systems. -->
  7 + <loadproperties srcFile="local.properties" />
  8 +
  9 + <!-- The ant.properties file can be created by you. It is only edited by the
  10 + 'android' tool to add properties to it.
  11 + This is the place to change some Ant specific build properties.
13 12 Here are some properties you may want to change/update:
14 13
15 14 source.dir
@@ -17,6 +16,9 @@
17 16 out.dir
18 17 The name of the output directory. Default is 'bin'.
19 18
  19 + For other overridable properties, look at the beginning of the rules
  20 + files in the SDK, at tools/ant/build.xml
  21 +
20 22 Properties related to the SDK location or the project target should
21 23 be updated using the 'android' tool with the 'update' action.
22 24
@@ -24,17 +26,24 @@
24 26 application and should be checked into Version Control Systems.
25 27
26 28 -->
27   - <property file="build.properties" />
  29 + <property file="ant.properties" />
28 30
29   - <!-- The default.properties file is created and updated by the 'android'
  31 + <!-- The project.properties file is created and updated by the 'android'
30 32 tool, as well as ADT.
  33 +
  34 + This contains project specific properties such as project target, and library
  35 + dependencies. Lower level build properties are stored in ant.properties
  36 + (or in .classpath for Eclipse projects).
  37 +
31 38 This file is an integral part of the build system for your
32 39 application and should be checked into Version Control Systems. -->
33   - <property file="default.properties" />
  40 + <loadproperties srcFile="project.properties" />
34 41
35   -
36   - <!-- Required pre-setup import -->
37   - <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
  42 + <!-- quick check on sdk.dir -->
  43 + <fail
  44 + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
  45 + unless="sdk.dir"
  46 + />
38 47
39 48
40 49 <!-- extension targets. Uncomment the ones where you want to do custom work
@@ -45,35 +54,32 @@
45 54 <target name="-pre-compile">
46 55 </target>
47 56
48   - [This is typically used for code obfuscation.
49   - Compiled code location: ${out.classes.absolute.dir}
50   - If this is not done in place, override ${out.dex.input.absolute.dir}]
  57 + /* This is typically used for code obfuscation.
  58 + Compiled code location: ${out.classes.absolute.dir}
  59 + If this is not done in place, override ${out.dex.input.absolute.dir} */
51 60 <target name="-post-compile">
52 61 </target>
53 62 -->
54 63
55   - <!-- Execute the Android Setup task that will setup some properties
56   - specific to the target, and import the build rules files.
57   -
58   - The rules file is imported from
59   - <SDK>/tools/ant/
60   - Depending on the project type it can be either:
61   - - main_rules.xml
62   - - lib_rules.xml
63   - - test_rules.xml
  64 + <!-- Import the actual build file.
64 65
65 66 To customize existing targets, there are two options:
66 67 - Customize only one target:
67 68 - copy/paste the target into this file, *before* the
68   - <setup> task.
  69 + <import> task.
69 70 - customize it to your needs.
70   - - Customize the whole script.
  71 + - Customize the whole content of build.xml
71 72 - copy/paste the content of the rules files (minus the top node)
72   - into this file, *after* the <setup> task
73   - - disable the import of the rules by changing the setup task
74   - below to <setup import="false" />.
  73 + into this file, replacing the <import> task.
75 74 - customize to your needs.
  75 +
  76 + ***********************
  77 + ****** IMPORTANT ******
  78 + ***********************
  79 + In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
  80 + in order to avoid having your file be overridden by tools such as "android update project"
76 81 -->
77   - <setup />
  82 + <!-- version-tag: 1 -->
  83 + <import file="${sdk.dir}/tools/ant/build.xml" />
78 84
79 85 </project>
10 libs/armeabi-v7a/gdb.setup
... ... @@ -1,6 +1,6 @@
1   -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
2   -directory /home/arturo/Descargas/android-ndk-r6/platforms/android-8/arch-arm/usr/include
3   -directory /home/arturo/Escritorio/openFrameworks/apps/artvertiser/androidFerns/src
4   -directory /home/arturo/Descargas/android-ndk-r6/sources/cxx-stl/system
5   -directory /home/arturo/Escritorio/openFrameworks/apps/artvertiser/androidFerns/libs/armeabi-v7a
  1 +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
  2 +directory /Users/damian/code/android/android-ndk-r6b/platforms/android-8/arch-arm/usr/include
  3 +directory /Users/damian/code/ofgit/apps/artvertiser/TheArtvertiserAndroid/src
  4 +directory /Users/damian/code/android/android-ndk-r6b/sources/cxx-stl/system
  5 +directory /Users/damian/code/ofgit/apps/artvertiser/TheArtvertiserAndroid/libs/armeabi-v7a
6 6
BIN  libs/armeabi-v7a/gdbserver
Binary file not shown
2  project.properties
@@ -7,7 +7,7 @@
7 7 # "ant.properties", and override values to adapt the script to your
8 8 # project structure.
9 9
10   -android.library.reference.1=../../../addons/ofxAndroid/ofAndroidLib/
  10 +android.library.reference.1=../../../addons/ofxAndroid/ofAndroidLib
11 11 # Project target.
12 12 target=Google Inc.:Google APIs:8
13 13 android.library.reference.1=../../../addons/ofxAndroid/ofAndroidLib
2  srcJava/cc/openframeworks/OFAndroidGoogleMaps.java
@@ -8,7 +8,7 @@
8 8 import android.util.Log;
9 9 import android.view.View;
10 10 import android.view.ViewGroup.MarginLayoutParams;
11   -import cc.openframeworks.androidFerns.R;
  11 +import cc.openframeworks.TheArtvertiserAndroid.R;
12 12
13 13 import com.google.android.maps.GeoPoint;
14 14 import com.google.android.maps.MapView;
0  ...va/cc/openframeworks/androidFerns/OFActivity.java → ...nframeworks/TheArtvertiserAndroid/OFActivity.java
File renamed without changes

0 comments on commit 635a332

Please sign in to comment.
Something went wrong with that request. Please try again.