Merge pull request #5 from appcelerator-modules/master

Master --> Stable

Author: jonalter

.travis.yml

@@ -2,12 +2,55 @@ language: objective-c
 before_install:
     - MODULE_ROOT=$PWD
 install: 
-    - mkdir -p /Library/Application\ Support/Titanium/
-    - wget http://api.appcelerator.net/p/v1/release-download?token=y4qAVWK3 -O /Library/Application\ Support/Titanium/mobilesdk-1.6.0-osx.zip
+    - mkdir -p /Library/Application\ Support/Titanium/sdks/
+    - mkdir -p python
+    
+    # install py markdown
+    - export PYTHONPATH=${PYTHONPATH}:$PWD/support
+    
+    # Android SDK seems to require newer version of SDK
+    - wget http://api.appcelerator.net/p/v1/release-download?token=34yycjh6 -O /Library/Application\ Support/Titanium/mobilesdk-2.1.3.GA-osx.zip
     - cd /Library/Application\ Support/Titanium/
-    - unzip -o  mobilesdk-1.6.0-osx.zip
+    - unzip -o  mobilesdk-2.1.3.GA-osx.zip
+ 
+    
+    # IOS uses v.1.6
+    #- wget http://api.appcelerator.net/p/v1/release-download?token=y4qAVWK3 -O /Library/Application\ Support/Titanium/mobilesdk-1.6.0-osx.zip
+    #- cd /Library/Application\ Support/Titanium/
+    #- unzip -o mobilesdk-1.6.0-osx.zip
+
+    # Install Android SDK
+    - cd /Library/Application\ Support/Titanium/sdks/
+    - wget http://dl.google.com/android/android-sdk_r22.6.2-macosx.zip
+    - unzip -o android-sdk_r22.6.2-macosx.zip
+    - export ANDROID_HOME=${PWD}/android-sdk-macosx
+
+    - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+
+    # Install required Android components.
+    - echo "y" | android update sdk --filter platform-tools,android-8,android-10,addon-google_apis-google-10,extra-android-support,$ANDROID_SDKS --no-ui --force
+    
+    # Install require Android NDK
+    - cd $MODULE_ROOT
+    # NDK r9d
+    #- wget http://dl.google.com/android/ndk/android-ndk-r9d-darwin-x86.tar.bz2
+    #- tar xzf android-ndk-r9d-darwin-x86.tar.bz2
+    #- export ANDROID_NDK=${PWD}/android-ndk-r9d
+    
+    # NDK r8c
+    - wget http://dl.google.com/android/ndk/android-ndk-r8c-darwin-x86.tar.bz2
+    - tar xzf android-ndk-r8c-darwin-x86.tar.bz2
+    - export ANDROID_NDK=${PWD}/android-ndk-r8c
+    
+    # Copy build.properties from support to android folder
+    - cp $MODULE_ROOT/support/build.properties $MODULE_ROOT/android/
 before_script:
     - cd $MODULE_ROOT
 script: 
-    - cd ./ios/
+    - cd $MODULE_ROOT/ios/
     - ./build.py
+    
+    - cd $MODULE_ROOT/android/
+    - ant clean
+    - ant
+

android/lib/README

@@ -0,0 +1,2 @@
+This folder is required by the build process even if no
+3rd party libraries are being used in the module.

support/build.properties

@@ -0,0 +1,3 @@
+titanium.platform=/Library/Application Support/Titanium/mobilesdk/osx/2.1.3.GA/android
+android.platform=/Library/Application Support/Titanium/sdks/android-sdk-macosx/platforms/android-10
+google.apis=/Library/Application Support/Titanium/sdks/android-sdk-macosx/add-ons/addon-google_apis-google-10