Merge pull request #1383 from dumganhar/gles20

Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse.

cocos2dx/platform/android/java/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>java</name>
+	<name>libcocos2dx</name>
 	<comment></comment>
 	<projects>
 	</projects>

samples/HelloCpp/proj.android/.project

@@ -30,11 +30,4 @@
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>src_common</name>
-			<type>2</type>
-			<locationURI>PARENT-3-PROJECT_LOC/cocos2dx/platform/android/java/src_common</locationURI>
-		</link>
-	</linkedResources>
 </projectDescription>

template/android/copy_files.sh

@@ -45,10 +45,6 @@ copy_src_and_jni(){
     sh $COCOS2DX_ROOT/template/android/gamemk.sh $APP_DIR/proj.android/jni/Android.mk $NEED_BOX2D $NEED_CHIPMUNK $NEED_LUA
 }
 
-copy_library_src(){
-    cp -rf $COCOSJAVALIB_ROOT/src_common/* $APP_DIR/proj.android/src/
-}
-
 # copy build_native.sh and replace something
 copy_build_native(){
     # here should use # instead of /, why??
@@ -95,7 +91,6 @@ copy_icon(){
 copy_cpp_h
 copy_resouces
 copy_src_and_jni
-copy_library_src
 copy_build_native
 modify_project_classpath
 modify_androidmanifest