From af7ff675774994c19f8e06cba05ec3a000a16a73 Mon Sep 17 00:00:00 2001 From: "yanli.huang" Date: Thu, 28 Jul 2016 22:18:18 +0800 Subject: [PATCH] fix: proj.android-studio compiled failed --- .../android/res/mipmap-layout/plugin_ads.xml | 24 +++++++++++++++++++ .../cocos-project-template.json | 3 ++- .../cocos-project-template.json | 13 ++++++++-- .../cocos-project-template.json | 13 ++++++++-- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 native/extensions/anysdk/platform/android/res/mipmap-layout/plugin_ads.xml diff --git a/native/extensions/anysdk/platform/android/res/mipmap-layout/plugin_ads.xml b/native/extensions/anysdk/platform/android/res/mipmap-layout/plugin_ads.xml new file mode 100644 index 0000000000..72dad5c589 --- /dev/null +++ b/native/extensions/anysdk/platform/android/res/mipmap-layout/plugin_ads.xml @@ -0,0 +1,24 @@ + + + + + + + + + \ No newline at end of file diff --git a/native/templates/js-template-binary/cocos-project-template.json b/native/templates/js-template-binary/cocos-project-template.json index d0054b8361..3ea4139ef0 100755 --- a/native/templates/js-template-binary/cocos-project-template.json +++ b/native/templates/js-template-binary/cocos-project-template.json @@ -62,7 +62,8 @@ "from":"extensions/anysdk/platform/android", "to":"frameworks/runtime-src/proj.android", "exclude": [ - "res/mipmap" + "res/mipmap", + "res/mipmap-layout/" ] } ], diff --git a/native/templates/js-template-default/cocos-project-template.json b/native/templates/js-template-default/cocos-project-template.json index 400ff2143f..8ee90566f5 100755 --- a/native/templates/js-template-default/cocos-project-template.json +++ b/native/templates/js-template-default/cocos-project-template.json @@ -42,14 +42,23 @@ "from":"extensions/anysdk/platform/android", "to":"frameworks/runtime-src/proj.android", "exclude": [ - "res/mipmap" + "res/mipmap", + "res/mipmap-layout/" ] }, { "from":"extensions/anysdk/platform/android", "to":"frameworks/runtime-src/proj.android-studio/app", "exclude": [ - "res/drawable" + "res/drawable", + "res/mipmap-layout/" + ] + }, + { + "from":"extensions/anysdk/platform/android/res/mipmap-layout/", + "to":"frameworks/runtime-src/proj.android-studio/app/res/layout", + "include": [ + "*" ] } ], diff --git a/native/templates/js-template-link/cocos-project-template.json b/native/templates/js-template-link/cocos-project-template.json index 928f3670ee..5b54197576 100755 --- a/native/templates/js-template-link/cocos-project-template.json +++ b/native/templates/js-template-link/cocos-project-template.json @@ -55,14 +55,23 @@ "from":"extensions/anysdk/platform/android", "to":"frameworks/runtime-src/proj.android", "exclude": [ - "res/mipmap" + "res/mipmap", + "res/mipmap-layout/" ] }, { "from":"extensions/anysdk/platform/android", "to":"frameworks/runtime-src/proj.android-studio/app", "exclude": [ - "res/drawable" + "res/drawable", + "res/mipmap-layout/" + ] + }, + { + "from":"extensions/anysdk/platform/android/res/mipmap-layout/", + "to":"frameworks/runtime-src/proj.android-studio/app/res/layout", + "include": [ + "*" ] } ],