Merge pull request #6785 from ricardoquesada/ooops_android_fixes

Fixes android build issues

cocos/platform/android/Android.mk

@@ -25,12 +25,8 @@ jni/TouchesJni.cpp
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+                    $(LOCAL_PATH)/.. \
                     $(LOCAL_PATH)/../.. \
-                    $(LOCAL_PATH)/../../.. \
-                    $(LOCAL_PATH)/../../../base \
-                    $(LOCAL_PATH)/../../../math \
-                    $(LOCAL_PATH)/../../../physics \
-                    $(LOCAL_PATH)/../../../renderer
 
 LOCAL_LDLIBS := -lGLESv1_CM \
                 -lGLESv2 \

cocos/platform/android/java/project.properties

@@ -0,0 +1,15 @@
+# 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
+# Project target.
+target=android-10

cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FullDeploy>true</FullDeploy>
+  </PropertyGroup>
+</Project>