diff options
| author | C. Sean Young <csyoung@google.com> | 2015-06-12 12:08:41 -0500 |
|---|---|---|
| committer | C. Sean Young <csyoung@google.com> | 2015-06-12 12:08:41 -0500 |
| commit | 3641c822d6263ea90969ad037153f59efbac04bf (patch) | |
| tree | 49b7fd7b6e6db2bccc76869ddd076e39addbaba8 | |
| parent | 59aecf8bd971934daca691d9951f338835f6c993 (diff) | |
| parent | b4dd76b8ab8122f4cef81b095cdd7b28f3701ae9 (diff) | |
| download | android_external_doclava-3641c822d6263ea90969ad037153f59efbac04bf.tar.gz android_external_doclava-3641c822d6263ea90969ad037153f59efbac04bf.tar.bz2 android_external_doclava-3641c822d6263ea90969ad037153f59efbac04bf.zip | |
resolved conflicts for merge of b4dd76b8 to mnc-dev
Change-Id: I2525c9113664db9c9d3a750347058973e6f74972
| -rw-r--r-- | build.gradle | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index 382e10d..0fdc5d1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,7 @@ apply plugin: 'java' +import com.android.internal.BuildUtils + sourceSets { main { java { @@ -10,7 +12,9 @@ sourceSets { } } } + // TODO put this function in a plugin +// TODO remove when prebuilt's case will always properly work with BuildUtils's version. String findToolsJar() { new ByteArrayOutputStream().withStream { os -> project.exec { @@ -22,12 +26,12 @@ String findToolsJar() { } } - if (project.hasProperty("usePrebuilts") && project.usePrebuilts == "true") { repositories { maven { url '../../prebuilts/tools/common/m2/repository' } } + // TODO refactor to allow referencing the "gradle way" dependencies { compile files(findToolsJar()) compile files('../../prebuilts/misc/common/antlr/antlr-3.4-complete.jar') @@ -40,7 +44,7 @@ if (project.hasProperty("usePrebuilts") && project.usePrebuilts == "true") { } } else { dependencies { - compile files(findToolsJar()) + compile files(BuildUtils.findToolsJar(project)) compile project(path: ':antlr', configuration: 'antlrRuntime') compile project(':jsilver') compile project(':tagsoup') |