diff options
| author | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-07-02 15:41:47 -0400 |
|---|---|---|
| committer | Oluwatobi Bashir-Bello <nbashirbello@google.com> | 2014-07-17 16:39:52 -0400 |
| commit | 8d3a60b938239b48b511681b7d190b3e7fc5e65c (patch) | |
| tree | aa9bdf27ec334d57897a87a42d360b134ff5d997 | |
| parent | 38117ed9c42c557aae6f2203151b49c7ac8b6011 (diff) | |
| download | idea-8d3a60b938239b48b511681b7d190b3e7fc5e65c.tar.gz | |
Add Google login to the AS build.
Change-Id: I3ef292551c750ece00bc5ae63f15c497ff797ea0
| -rw-r--r-- | .idea/modules.xml | 1 | ||||
| -rw-r--r-- | build/scripts/layouts.gant | 16 | ||||
| -rw-r--r-- | community-main.iml | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml index 46ac117dffbd..2c4c2438a8c7 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -72,6 +72,7 @@ <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" group="plugins/GAE" /> <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" group="plugins/GAE" /> <module fileurl="file://$PROJECT_DIR$/../studio/cloud/google-cloud-tools.iml" filepath="$PROJECT_DIR$/../studio/cloud/google-cloud-tools.iml" group="plugins/Google" /> + <module fileurl="file://$PROJECT_DIR$/../studio/cloud/login/google-login.iml" filepath="$PROJECT_DIR$/../studio/cloud/login/google-login.iml" /> <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle.iml" group="community/plugins/gradle" /> <module fileurl="file://$PROJECT_DIR$/../base/gradle-import/gradle-import.iml" filepath="$PROJECT_DIR$/../base/gradle-import/gradle-import.iml" group="plugins/Android/android-sdk" /> <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" group="community/plugins/gradle" /> diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 0242911e31aa..746775891530 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -253,7 +253,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"] @@ -665,6 +665,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 = [ @@ -730,7 +731,7 @@ def layoutAndroid() { } } -def layoutCloud() { +def layoutGoogle() { dir("plugins") { layoutPlugin("google-cloud-tools") { jar("google-cloud-tools.jar") { @@ -746,6 +747,17 @@ def layoutCloud() { 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") + } } } diff --git a/community-main.iml b/community-main.iml index a56cb309b19f..4e83afc184dc 100644 --- a/community-main.iml +++ b/community-main.iml @@ -104,6 +104,7 @@ <orderEntry type="module" module-name="community-tests" scope="TEST" /> <orderEntry type="module" module-name="google-cloud-tools" /> <orderEntry type="module" module-name="jira" /> + <orderEntry type="module" module-name="google-login" /> </component> </module> |