diff options
| author | Dave Holmes <daveholmes@google.com> | 2014-06-04 23:35:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-04 23:35:50 +0000 |
| commit | aabfcb78cf29e3d670831c770b9d757eb79487e4 (patch) | |
| tree | 818bdd75e73bd367371aace8030c2209b869b337 /docs/html | |
| parent | 2e10cc9021b1cd3d90c55038191872f29a02c3f2 (diff) | |
| parent | d9659890672141ee0722e8d1ae8d8e091e848265 (diff) | |
| download | frameworks_base-aabfcb78cf29e3d670831c770b9d757eb79487e4.zip frameworks_base-aabfcb78cf29e3d670831c770b9d757eb79487e4.tar.gz frameworks_base-aabfcb78cf29e3d670831c770b9d757eb79487e4.tar.bz2 | |
Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/google/play-services/setup.jd | 4 | ||||
| -rw-r--r-- | docs/html/sdk/installing/studio.jd | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/html/google/play-services/setup.jd b/docs/html/google/play-services/setup.jd index d502e8d..744e191 100644 --- a/docs/html/google/play-services/setup.jd +++ b/docs/html/google/play-services/setup.jd @@ -95,7 +95,9 @@ you can continue development with the Google Play services SDK, but must instead <li>Open the <code>build.gradle</code> file inside your application module directory. <p class="note"><strong>Note:</strong> Android Studio projects contain a top-level <code>build.gradle</code> file and a <code>build.gradle</code> file for each module. - Be sure to edit the file for your application module.</p></li> + Be sure to edit the file for your application module. See + <a href="{@docRoot}sdk/installing/studio-build.html">Building Your Project with + Gradle</a> for more information about Gradle.</p></li> <li>Add a new build rule under <code>dependencies</code> for the latest version of <code>play-services</code>. For example: <pre class="no-pretty-print"> diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd index 2ad5808..a6f1115 100644 --- a/docs/html/sdk/installing/studio.jd +++ b/docs/html/sdk/installing/studio.jd @@ -395,7 +395,9 @@ screen that offers several ways to get started:</p> <p class="note"><strong>Note:</strong> If you previously developed your Android project with Eclipse, you should first use the new export feature in the ADT plugin to prepare your project with the new Gradle build system. For more information, read - <a href="{@docRoot}sdk/installing/migrate.html">Migrating from Eclipse</a>.</p> + <a href="{@docRoot}sdk/installing/migrate.html">Migrating from Eclipse</a> and + <a href="{@docRoot}sdk/installing/studio-build.html">Building Your Project with + Gradle</a>.</p> </li> </ul> |