Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e99af34 authored by Dave Holmes's avatar Dave Holmes Committed by Android Git Automerger
Browse files

am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask... 

am aabfcb78: 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

* commit 'aabfcb78':
  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.
parents 03df93bc aabfcb78

docs/html/google/play-services/setup.jd

+3 −1
Original line number Diff line number Diff line
@@ -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">

docs/html/sdk/installing/studio.jd

+3 −1
Original line number Diff line number Diff line
@@ -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>