Compatibility with latest SDK and a minor improvement

cocos2d-android/.gitignore

@@ -1,3 +1,4 @@
 .idea/
 local.properties
 
+/.classpath

cocos2d-android/build.properties → cocos2d-android/ant.properties

@@ -1,6 +1,6 @@
 # This file is used to override default values used by the Ant build system.
-# 
-# This file must be checked in Version Control Systems, as it is
+#
+# This file must be checked into Version Control Systems, as it is
 # integral to the build system of your project.
 
 # This file is only used by the Ant script.

cocos2d-android/build.xml

@@ -2,77 +2,91 @@
 <project name="Cocos2D" 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. -->
+    <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 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" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- 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' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (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})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- 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/>
-
-    <!-- These two lines let you build cocos2d-android against Android 2.3.1 -->
-    <path id="android.libraries.src"><path refid="project.libraries.src" /></path>
-    <path id="android.libraries.jars"><path refid="project.libraries.jars" /></path>
-
-    <target name="jar" depends="compile">
-      <jar destfile="libs/cocos2d-android.jar">
-        <fileset dir="bin/classes" includes="**/*.class"/>
-        <fileset dir="." includes="assets/fps_images.png"/>
-      </jar>
-    </target>
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>

cocos2d-android/proguard-project.txt

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

cocos2d-android/project.properties

@@ -0,0 +1,17 @@
+# 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 edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+android.library=true
+# Indicates whether an apk should be generated for each density.
+split.density=false
+# Project target.
+target=android-16

cocos2d-android/src/org/cocos2d/opengl/CCGLSurfaceView.java

@@ -6,6 +6,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.util.AttributeSet;
 import android.view.MotionEvent;
 
 public class CCGLSurfaceView extends GLSurfaceView {
@@ -17,40 +18,48 @@ public class CCGLSurfaceView extends GLSurfaceView {
 
     public CCGLSurfaceView(Context context) {
         super(context);
+        init(context);
+    }
+
+    public CCGLSurfaceView(Context context, AttributeSet attrs){
+      super(context, attrs);
+      init(context);
+    }
 
-        CCDirector.theApp = (Activity) context;
+    private void init(Context context) {
+      CCDirector.theApp = (Activity) context;
 
-        mDispatcher = CCTouchDispatcher.sharedDispatcher();
+      mDispatcher = CCTouchDispatcher.sharedDispatcher();
 
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-        this.setId(VIEWID);
+      setFocusable(true);
+      setFocusableInTouchMode(true);
+      this.setId(VIEWID);
 
-        // add this to resolve Samsung's Galaxy opengl problem
-        //  here for reference.
-        // http://www.anddev.org/samsung_galaxy_odd_ogl_es_hardware_acceleration_resolved-t8511.html
-        /* need a real machine to test
-        this.setEGLConfigChooser(
-        		new GLSurfaceView.EGLConfigChooser() {
-        			public EGLConfig chooseConfig(EGL10 egl,EGLDisplay display) {
-        				int[] attributes=new int[]{
-        						//EGL10.EGL_RED_SIZE,
-        						//5,
-        						//EGL10.EGL_BLUE_SIZE,
-        						//5,
-        						//EGL10.EGL_GREEN_SIZE,
-        						//6,
-        						EGL10.EGL_DEPTH_SIZE,
-        						16,
-        						EGL10.EGL_NONE
-        				};
-        				EGLConfig[] configs=new EGLConfig[1];
-        				int[] result=new int[1];
-        				egl.eglChooseConfig(display,attributes,configs,1,result);
-        				return configs[0];
-        			}
-        		}
-        );*/
+      // add this to resolve Samsung's Galaxy opengl problem
+      //  here for reference.
+      // http://www.anddev.org/samsung_galaxy_odd_ogl_es_hardware_acceleration_resolved-t8511.html
+      /* need a real machine to test
+      this.setEGLConfigChooser(
+      		new GLSurfaceView.EGLConfigChooser() {
+      			public EGLConfig chooseConfig(EGL10 egl,EGLDisplay display) {
+      				int[] attributes=new int[]{
+      						//EGL10.EGL_RED_SIZE,
+      						//5,
+      						//EGL10.EGL_BLUE_SIZE,
+      						//5,
+      						//EGL10.EGL_GREEN_SIZE,
+      						//6,
+      						EGL10.EGL_DEPTH_SIZE,
+      						16,
+      						EGL10.EGL_NONE
+      				};
+      				EGLConfig[] configs=new EGLConfig[1];
+      				int[] result=new int[1];
+      				egl.eglChooseConfig(display,attributes,configs,1,result);
+      				return configs[0];
+      			}
+      		}
+      );*/
     }
 
     @Override