diff options
Diffstat (limited to 'build/scripts/layouts.gant')
-rw-r--r-- | build/scripts/layouts.gant | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 55053c774bc4..626095994a8b 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -262,7 +262,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir public def layoutCommunityPlugins(String home) { layoutAndroid() - layoutCloud() + layoutGoogle() dir("plugins") { def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"] @@ -563,15 +563,32 @@ public def layoutCommunityPlugins(String home) { } } -def layoutCloud() { +def layoutGoogle() { dir("plugins") { layoutPlugin("google-cloud-tools") { jar("google-cloud-tools.jar") { module("google-cloud-tools") } dir("templates") { - fileset(dir: "$home/../studio/cloud/resources/templates") + fileset(dir: "${home}/../studio/cloud/resources/templates") } + dir("clientTemplates") { + fileset(dir: "${home}/../studio/cloud/resources/clientTemplates") + } + fileset(dir: "${home}/../studio/cloud/lib") { + include(name: "**/*.jar") + } + } + layoutPlugin("google-login") { + jar("google-login.jar") { + module("google-login") + } + fileset(dir: "${home}/../studio/cloud/login/lib") { + include(name: "**/*.jar") + } + // Additional libraries that need to be manually copied, see how freemarker + // is copied by the Android plugin + fileset(file: "${home}/../../prebuilts/tools/common/google-api-java-client/1.8.0-rc/google-api-java-client-min-repackaged.jar") } } } @@ -763,6 +780,7 @@ def layoutAndroid() { // Note: This is a HACK: rather than encoding the full path, we should really query // the project model for the classpath just like we do for the androidModules' dependencies // below + // Also see similar issue in Google Cloud Login plugin fileset(file: "${home}/../../prebuilts/tools/common/m2/repository/org/freemarker/freemarker/2.3.20/freemarker-2.3.20.jar") androidModules = [ |