mirror of https://github.com/axmolengine/axmol.git
Merge pull request #12013 from natural-law/v3
Support build & run Android Studio project in console.
This commit is contained in:
minggo
commit
3add3477dd
|
|
@ -113,6 +113,10 @@ build/build/
|
|||
cocos/scripting/lua-bindings/proj.ios_mac/build/
|
||||
tests/*/runtime/
|
||||
tests/*/publish/
|
||||
tests/*/project/proj.android-studio/app/build.xml
|
||||
tests/*/project/proj.android-studio/app/proguard-project.txt
|
||||
tests/*/proj.android-studio/app/build.xml
|
||||
tests/*/proj.android-studio/app/proguard-project.txt
|
||||
|
||||
# Android
|
||||
project.properties
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
"proj.android/AndroidManifest.xml",
|
||||
"proj.android/build.xml",
|
||||
"proj.android/res/values/strings.xml",
|
||||
"proj.android-studio/settings.gradle",
|
||||
"proj.ios_mac/ios/main.m",
|
||||
"proj.ios_mac/ios/Prefix.pch",
|
||||
"proj.ios_mac/PROJECT_NAME.xcodeproj/project.pbxproj",
|
||||
|
|
@ -51,7 +52,9 @@
|
|||
"project_replace_package_name":{
|
||||
"src_package_name":"org.cocos2dx.hellocpp",
|
||||
"files":[
|
||||
"proj.android/AndroidManifest.xml"
|
||||
"proj.android/AndroidManifest.xml",
|
||||
"proj.android-studio/app/build.gradle",
|
||||
"proj.android-studio/app/AndroidManifest.xml"
|
||||
]
|
||||
},
|
||||
"project_replace_mac_bundleid": {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
android:value="cocos2dcpp" />
|
||||
|
||||
<activity
|
||||
android:name=".AppActivity"
|
||||
android:name="org.cocos2dx.cpp.AppActivity"
|
||||
android:screenOrientation="landscape"
|
||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
||||
android:label="@string/app_name"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ android {
|
|||
buildToolsVersion "22.0.1"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "org.cocos2dx.cpp_empty_test"
|
||||
applicationId "org.cocos2dx.hellocpp"
|
||||
minSdkVersion 10
|
||||
targetSdkVersion 22
|
||||
versionCode 1
|
||||
|
|
@ -20,10 +20,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../cocos2d",
|
||||
"../cocos2d/cocos",
|
||||
"../cocos2d/external"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../Resources",
|
||||
"to": ""
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx'
|
||||
project(':libcocos2dx').projectDir = new File(settingsDir, '../cocos2d/cocos/platform/android/libcocos2dx')
|
||||
include ':app'
|
||||
include ':HelloCpp'
|
||||
project(':HelloCpp').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@
|
|||
"frameworks/runtime-src/proj.android/AndroidManifest.xml",
|
||||
"frameworks/runtime-src/proj.android/build.xml",
|
||||
"frameworks/runtime-src/proj.android/res/values/strings.xml",
|
||||
"frameworks/runtime-src/proj.android-studio/settings.gradle",
|
||||
"frameworks/runtime-src/proj.ios_mac/ios/main.m",
|
||||
"frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch",
|
||||
"frameworks/runtime-src/proj.ios_mac/PROJECT_NAME.xcodeproj/project.pbxproj",
|
||||
|
|
@ -77,7 +78,9 @@
|
|||
"project_replace_package_name":{
|
||||
"src_package_name":"org.cocos2dx.hellojavascript",
|
||||
"files":[
|
||||
"frameworks/runtime-src/proj.android/AndroidManifest.xml"
|
||||
"frameworks/runtime-src/proj.android/AndroidManifest.xml",
|
||||
"frameworks/runtime-src/proj.android-studio/app/build.gradle",
|
||||
"frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml"
|
||||
]
|
||||
},
|
||||
"project_replace_mac_bundleid":{
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
android:value="cocos2djs" />
|
||||
|
||||
<activity
|
||||
android:name=".AppActivity"
|
||||
android:name="org.cocos2dx.javascript.AppActivity"
|
||||
android:screenOrientation="landscape"
|
||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
||||
android:label="@string/app_name"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ android {
|
|||
buildToolsVersion "22.0.1"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "org.cocos2dx.hellolua"
|
||||
applicationId "org.cocos2dx.hellojavascript"
|
||||
minSdkVersion 10
|
||||
targetSdkVersion 22
|
||||
versionCode 1
|
||||
|
|
@ -20,10 +20,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../../cocos2d-x",
|
||||
"../../cocos2d-x/cocos",
|
||||
"../../cocos2d-x/external"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../../../src",
|
||||
"to": "src"
|
||||
},
|
||||
{
|
||||
"from": "../../../res",
|
||||
"to": "res"
|
||||
},
|
||||
{
|
||||
"from": "../../../main.js",
|
||||
"to": ""
|
||||
},
|
||||
{
|
||||
"from": "../../../project.json",
|
||||
"to": ""
|
||||
},
|
||||
{
|
||||
"from": "../../cocos2d-x/cocos/scripting/js-bindings/script",
|
||||
"to": "script"
|
||||
}
|
||||
]
|
||||
}
|
||||
0
templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradlew
vendored
Normal file → Executable file
0
templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradlew
vendored
Normal file → Executable file
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx'
|
||||
project(':libcocos2dx').projectDir = new File(settingsDir, '../../cocos2d-x/cocos/platform/android/libcocos2dx')
|
||||
include ':app'
|
||||
include ':HelloJavascript'
|
||||
project(':HelloJavascript').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -173,6 +173,7 @@
|
|||
"frameworks/runtime-src/proj.android/AndroidManifest.xml",
|
||||
"frameworks/runtime-src/proj.android/build.xml",
|
||||
"frameworks/runtime-src/proj.android/res/values/strings.xml",
|
||||
"frameworks/runtime-src/proj.android-studio/settings.gradle",
|
||||
"frameworks/runtime-src/proj.ios_mac/ios/main.m",
|
||||
"frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch",
|
||||
"frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm",
|
||||
|
|
@ -182,7 +183,9 @@
|
|||
"project_replace_package_name": {
|
||||
"src_package_name": "org.cocos2dx.hellolua",
|
||||
"files": [
|
||||
"frameworks/runtime-src/proj.android/AndroidManifest.xml"
|
||||
"frameworks/runtime-src/proj.android/AndroidManifest.xml",
|
||||
"frameworks/runtime-src/proj.android-studio/app/build.gradle",
|
||||
"frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml"
|
||||
]
|
||||
},
|
||||
"project_replace_mac_bundleid": {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
android:value="cocos2dlua" />
|
||||
|
||||
<activity
|
||||
android:name=".AppActivity"
|
||||
android:name="org.cocos2dx.lua.AppActivity"
|
||||
android:screenOrientation="landscape"
|
||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
||||
android:label="@string/app_name"
|
||||
|
|
|
|||
|
|
@ -20,10 +20,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../../cocos2d-x",
|
||||
"../../cocos2d-x/cocos/",
|
||||
"../../cocos2d-x/external",
|
||||
"../../cocos2d-x/cocos/scripting"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../../../src",
|
||||
"to": "src"
|
||||
},
|
||||
{
|
||||
"from": "../../../res",
|
||||
"to": "res"
|
||||
}
|
||||
],
|
||||
"must_copy_resources": [
|
||||
{
|
||||
"from": "../../../config.json",
|
||||
"to": ""
|
||||
}
|
||||
]
|
||||
}
|
||||
0
templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradlew
vendored
Normal file → Executable file
0
templates/lua-template-default/frameworks/runtime-src/proj.android-studio/gradlew
vendored
Normal file → Executable file
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx'
|
||||
project(':libcocos2dx').projectDir = new File(settingsDir, '../../cocos2d-x/cocos/platform/android/libcocos2dx')
|
||||
include ':app'
|
||||
include ':HelloLua'
|
||||
project(':HelloLua').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -173,6 +173,7 @@
|
|||
"frameworks/runtime-src/proj.android/AndroidManifest.xml",
|
||||
"frameworks/runtime-src/proj.android/build.xml",
|
||||
"frameworks/runtime-src/proj.android/res/values/strings.xml",
|
||||
"frameworks/runtime-src/proj.android-studio/settings.gradle",
|
||||
"frameworks/runtime-src/proj.ios_mac/ios/main.m",
|
||||
"frameworks/runtime-src/proj.ios_mac/ios/Prefix.pch",
|
||||
"frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm",
|
||||
|
|
@ -182,7 +183,9 @@
|
|||
"project_replace_package_name": {
|
||||
"src_package_name": "org.cocos2dx.hellolua",
|
||||
"files": [
|
||||
"frameworks/runtime-src/proj.android/AndroidManifest.xml"
|
||||
"frameworks/runtime-src/proj.android/AndroidManifest.xml",
|
||||
"frameworks/runtime-src/proj.android-studio/app/build.gradle",
|
||||
"frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml"
|
||||
]
|
||||
},
|
||||
"project_replace_mac_bundleid": {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@
|
|||
"target_name": "cpp-empty-test Mac"
|
||||
},
|
||||
"android_cfg": {
|
||||
"project_path": "proj.android"
|
||||
"project_path": "proj.android",
|
||||
"studio_proj_path" : "proj.android-studio"
|
||||
},
|
||||
"wp8_1_cfg" : {
|
||||
"project_path": "../../build",
|
||||
|
|
|
|||
|
|
@ -20,10 +20,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../../..",
|
||||
"../../../cocos",
|
||||
"../../../external"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../Resources",
|
||||
"to": "",
|
||||
"exclude": [
|
||||
"*.gz"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx'
|
||||
project(':libcocos2dx').projectDir = new File(settingsDir, '../../../cocos/platform/android/libcocos2dx')
|
||||
include ':app'
|
||||
include ':CppEmptyTest'
|
||||
project(':CppEmptyTest').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@
|
|||
"target_name": "cpp-tests Mac"
|
||||
},
|
||||
"android_cfg": {
|
||||
"project_path": "proj.android"
|
||||
"project_path": "proj.android",
|
||||
"studio_proj_path" : "proj.android-studio"
|
||||
},
|
||||
"wp8_1_cfg" : {
|
||||
"project_path": "../../build",
|
||||
|
|
|
|||
|
|
@ -21,10 +21,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ LOCAL_SRC_FILES := main.cpp \
|
|||
../../../Classes/ShaderTest/ShaderTest.cpp \
|
||||
../../../Classes/ShaderTest/ShaderTest2.cpp \
|
||||
../../../Classes/SpineTest/SpineTest.cpp \
|
||||
../../../Classes/Scene3DTest/Scene3DTest.cpp \
|
||||
../../../Classes/Sprite3DTest/DrawNode3D.cpp \
|
||||
../../../Classes/Sprite3DTest/Sprite3DTest.cpp \
|
||||
../../../Classes/SpritePolygonTest/SpritePolygonTest.cpp \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../../..",
|
||||
"../../../cocos",
|
||||
"../../../external"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../Resources",
|
||||
"to": "",
|
||||
"exclude": [
|
||||
"*.gz"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx'
|
||||
project(':libcocos2dx').projectDir = new File(settingsDir, '../../../cocos/platform/android/libcocos2dx')
|
||||
include ':app'
|
||||
include ':CppTests'
|
||||
project(':CppTests').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
},
|
||||
"project_type": "cpp",
|
||||
"android_cfg": {
|
||||
"project_path": "proj.android"
|
||||
"project_path": "proj.android",
|
||||
"studio_proj_path" : "proj.android-studio"
|
||||
},
|
||||
"engine_dir": "../../"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,10 +20,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../../..",
|
||||
"../../../cocos",
|
||||
"../../../external"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../Resources",
|
||||
"to": "",
|
||||
"exclude": [
|
||||
"*.gz"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx_with_controller'
|
||||
project(':libcocos2dx_with_controller').projectDir = new File(settingsDir, '../../../cocos/platform/android/libcocos2dx-with-controller')
|
||||
include ':app'
|
||||
include ':GameControllerTest'
|
||||
project(':GameControllerTest').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@
|
|||
"target_name": "js-tests Mac"
|
||||
},
|
||||
"android_cfg": {
|
||||
"project_path": "project/proj.android"
|
||||
"project_path": "project/proj.android",
|
||||
"studio_proj_path" : "project/proj.android-studio"
|
||||
},
|
||||
"web_cfg": {
|
||||
"project_path": "",
|
||||
|
|
|
|||
|
|
@ -21,10 +21,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../../src",
|
||||
"to": "src"
|
||||
},
|
||||
{
|
||||
"from": "../../../cpp-tests/Resources/",
|
||||
"to": "res/",
|
||||
"exclude": [
|
||||
"*.gz"
|
||||
]
|
||||
},
|
||||
{
|
||||
"from": "../../main.js",
|
||||
"to": ""
|
||||
},
|
||||
{
|
||||
"from": "../../project.json",
|
||||
"to": ""
|
||||
},
|
||||
{
|
||||
"from": "../../../../cocos/scripting/js-bindings/script",
|
||||
"to": "script"
|
||||
}
|
||||
],
|
||||
"ndk_module_path": [
|
||||
"../../../..",
|
||||
"../../../../cocos",
|
||||
"../../../../external"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx'
|
||||
project(':libcocos2dx').projectDir = new File(settingsDir, '../../../../cocos/platform/android/libcocos2dx')
|
||||
include ':app'
|
||||
include ':JSTests'
|
||||
project(':JSTests').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -6,7 +6,10 @@
|
|||
},
|
||||
{
|
||||
"from": "../../../cpp-tests/Resources/",
|
||||
"to": "res/"
|
||||
"to": "res/",
|
||||
"exclude": [
|
||||
"*.gz"
|
||||
]
|
||||
},
|
||||
{
|
||||
"from": "../../main.js",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
"target_name": "lua-empty-test Mac"
|
||||
},
|
||||
"android_cfg": {
|
||||
"project_path": "project/proj.android"
|
||||
"project_path": "project/proj.android",
|
||||
"studio_proj_path" : "project/proj.android-studio"
|
||||
},
|
||||
"engine_dir": "../../"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,10 +21,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../../../..",
|
||||
"../../../../cocos",
|
||||
"../../../../external"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../../src",
|
||||
"to": "src"
|
||||
},
|
||||
{
|
||||
"from": "../../res",
|
||||
"to": "res"
|
||||
},
|
||||
{
|
||||
"from": "../../../../cocos/scripting/lua-bindings/script/",
|
||||
"to": "src/cocos"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx'
|
||||
project(':libcocos2dx').projectDir = new File(settingsDir, '../../../../cocos/platform/android/libcocos2dx')
|
||||
include ':app'
|
||||
include ':LuaEmptyTest'
|
||||
project(':LuaEmptyTest').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"project_type": "lua",
|
||||
"has_native": true,
|
||||
"android_cfg": {
|
||||
"project_path": "project/proj.android"
|
||||
"project_path": "project/proj.android",
|
||||
"studio_proj_path" : "project/proj.android-studio"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,10 +20,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../../../..",
|
||||
"../../../../cocos",
|
||||
"../../../../external"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../../src",
|
||||
"to": "src"
|
||||
},
|
||||
{
|
||||
"from": "../../res",
|
||||
"to": "res"
|
||||
},
|
||||
{
|
||||
"from": "../../../../cocos/scripting/lua-bindings/script/",
|
||||
"to": "src/cocos"
|
||||
},
|
||||
{
|
||||
"from": "../../../game-controller-test/Resources",
|
||||
"to": "res",
|
||||
"exclude": [
|
||||
"*.gz"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
0
tests/lua-game-controller-test/project/proj.android-studio/gradlew
vendored
Normal file → Executable file
0
tests/lua-game-controller-test/project/proj.android-studio/gradlew
vendored
Normal file → Executable file
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx_with_controller'
|
||||
project(':libcocos2dx_with_controller').projectDir = new File(settingsDir, '../../../../cocos/platform/android/libcocos2dx-with-controller')
|
||||
include ':app'
|
||||
include ':LuaGameControllerTest'
|
||||
project(':LuaGameControllerTest').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
"target_name": "lua-tests Mac"
|
||||
},
|
||||
"android_cfg": {
|
||||
"project_path": "project/proj.android"
|
||||
"project_path": "project/proj.android",
|
||||
"studio_proj_path" : "project/proj.android-studio"
|
||||
},
|
||||
"engine_dir": "../../"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,10 +21,25 @@ android {
|
|||
assets.srcDir "assets"
|
||||
}
|
||||
|
||||
signingConfigs {
|
||||
|
||||
release {
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
storeFile file(RELEASE_STORE_FILE)
|
||||
storePassword RELEASE_STORE_PASSWORD
|
||||
keyAlias RELEASE_KEY_ALIAS
|
||||
keyPassword RELEASE_KEY_PASSWORD
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
if (project.hasProperty("RELEASE_STORE_FILE")) {
|
||||
signingConfig signingConfigs.release
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
# 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 use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Project target.
|
||||
target=android-10
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"ndk_module_path" :[
|
||||
"../../../..",
|
||||
"../../../../cocos",
|
||||
"../../../../external"
|
||||
],
|
||||
"copy_resources": [
|
||||
{
|
||||
"from": "../../src",
|
||||
"to": "src"
|
||||
},
|
||||
{
|
||||
"from": "../../res/cocosbuilderRes",
|
||||
"to": "res/cocosbuilderRes"
|
||||
},
|
||||
{
|
||||
"from": "../../../cpp-tests/Resources",
|
||||
"to": "res",
|
||||
"exclude": [
|
||||
"*.gz"
|
||||
]
|
||||
},
|
||||
{
|
||||
"from": "../../../../cocos/scripting/lua-bindings/script/",
|
||||
"to": "src/cocos"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
include ':libcocos2dx'
|
||||
project(':libcocos2dx').projectDir = new File(settingsDir, '../../../../cocos/platform/android/libcocos2dx')
|
||||
include ':app'
|
||||
include ':LuaTests'
|
||||
project(':LuaTests').projectDir = new File(settingsDir, 'app')
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit ccca2ee5ad0d36188e674cff9f4db7428897bae8
|
||||
Subproject commit caaaef354e1e91f312676ee3086aff3a485b2d9d
|
||||
Loading…
Reference in New Issue