Commit Graph

42 Commits

Author SHA1 Message Date
James Chen cdad6b5868 Some Android Simulators don't support SSE instruction, so disable it for x86 arch. (#1011) 2017-11-23 15:13:34 +08:00
James Chen 7739e2c47d Updates template AndroidManifest.xml. 2017-11-07 16:05:44 +08:00
James Chen 50d6a4947d Reverts jniLibs.srcDir 2017-11-02 11:50:09 +08:00
James Chen 2c793ac5ba Android Studio 3.0 Support.
Depends on https://github.com/cocos-creator/cocos2d-console/pull/49
2017-10-30 11:28:34 +08:00
yinkaile d38e168441 support native modules 2017-10-12 17:35:08 +08:00
James Chen 2e3e474c3e [android] Adds APP_CFLAGS for template projects. 2017-10-10 14:28:51 +08:00
2youyouo2 859b9b1302 remove copy_resources from android-studio build-cfg.json 2017-09-29 16:10:56 +08:00
James Chen a0a312814d Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into fix/jsb2.0-sync-v1.6 2017-09-22 17:32:36 +08:00
James Chen f19fb0b1f8 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. 2017-09-15 10:41:32 +08:00
2youyouo2 9c12fcb2d9 add jailbreak anysdk files 2017-09-12 14:31:50 +08:00
2youyouo2 672d00478f fixed android-studio debug error 2017-09-01 11:18:27 +08:00
2youyouo2 19be5234c7 refine build.gradle 2017-08-23 10:45:28 +08:00
2youyouo2 49bfa517f2 update build tool version and gradle version 2017-08-23 10:45:07 +08:00
2youyouo2 93862c24fa fixed not copy .so files when first build android-studio project 2017-08-16 17:44:18 +08:00
2youyouo2 d0f80a3a46 update template for anysdk 2017-07-06 10:36:48 +08:00
pandamicro 99206af737 Remove useless module and preprocess macros 2017-07-04 16:35:17 +08:00
2youyouo2 992bb2724c fixed .so not compile to apk 2017-05-04 11:01:45 +08:00
2youyouo2 524c511ca5 set ndk_out for android-studio project 2017-05-02 13:54:49 +08:00
2youyouo2 d7b3bc096b fixed windows commands char length too long 2017-04-27 17:31:32 +08:00
2youyouo2 4ebcc72f19 update android-studio project 2017-04-21 09:37:40 +08:00
Wang Nan c3de6d4152 Merge pull request #448 from cocos-creator/v1.3
merge V1.3
2016-12-21 14:32:08 +08:00
knoxHuang 8812ead9bf add semicolon import android.os.Bundle for AppActivity 2016-12-20 18:10:18 +08:00
knoxHuang 871732c527 add android.os.Bundle for AppActivity 2016-12-20 17:29:41 +08:00
Nan Wang 563a2621ab merged v1.3 2016-12-16 13:54:56 +08:00
knoxHuang 1223dd2592 rm extra code for AppActivity 2016-12-16 10:35:50 +08:00
zhangbin a70c941f59 Update the icon of Android Studio project in templates. 2016-11-11 11:46:31 +08:00
zhangbin ddda30122d Solve the error application name of Android Studio project. 2016-10-10 13:44:38 +08:00
yanli.huang 19bf2d5ee5 fix built-in android project compiled failed 2016-09-23 12:04:24 +08:00
yanli.huang 6606b2ec23 update AnySDK 2.2.3 2016-09-20 16:37:23 +08:00
zhangbin f97b23514b Use java reflection to avoid API level dependent, Use API Level 10. 2016-08-25 09:56:32 +08:00
yanli.huang 4fb94eef21 strip anysdk from template.add anysdk by copy way 2016-07-28 13:56:06 +08:00
yanli.huang 9f916841fe Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	templates/js-template-binary/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/js-template-binary/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp
	templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java
	templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
2016-07-21 16:11:50 +08:00
yanli.huang 0aaab3fa5e add anysdk to templates 2016-07-13 16:37:07 +08:00
2youyouo2 259fc314a1 remove runtime files from binary template 2016-07-13 15:11:09 +08:00
2youyouo2 4aadc944c3 add project.properties 2016-06-29 18:36:09 +08:00
knoxHuang 048266e40b add JS and JAVA reflection test tips for AppActivity.java 2016-06-13 18:06:18 +08:00
knoxHuang fb6d6d7b8a update CCJavascriptJavaBridge 2016-06-13 17:39:33 +08:00
2youyouo2 d45928a655 reset build.gradle 2016-06-01 17:40:12 +08:00
2youyouo2 4a991bd642 update android-studio templates 2016-05-26 18:42:54 +08:00
2youyouo2 54f91df786 update templates 2016-04-12 10:32:10 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin b3441f7981 Add template project 2016-03-30 21:12:14 +08:00