am 59672ccd: am e64dc94c: Fix incorrect proguard keepfile generation for fields.
* commit '59672ccdeb9f1d7572a44d69ee96812ec5ed8622':
Fix incorrect proguard keepfile generation for fields.
diff --git a/build.gradle b/build.gradle
index 79d856e..382e10d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@
String findToolsJar() {
new ByteArrayOutputStream().withStream { os ->
project.exec {
- executable "$rootDir/build/core/find-jdk-tools-jar.sh"
+ executable "../../build/core/find-jdk-tools-jar.sh"
standardOutput = os
}
@@ -22,9 +22,27 @@
}
}
-dependencies {
- compile files(findToolsJar())
- compile project(path: ':antlr', configuration: 'antlrRuntime')
- compile project(':jsilver')
- compile project(':tagsoup')
-}
\ No newline at end of file
+
+if (project.hasProperty("usePrebuilts") && project.usePrebuilts == "true") {
+ repositories {
+ maven { url '../../prebuilts/tools/common/m2/repository' }
+ }
+
+ dependencies {
+ compile files(findToolsJar())
+ compile files('../../prebuilts/misc/common/antlr/antlr-3.4-complete.jar')
+ compile 'com.google.jsilver:jsilver:1.0.0'
+ // TODO add tagsoup to prebuils to fully support building using prebuilts
+ compile project(':tagsoup')
+ // required by jsilver
+ compile 'com.google.guava:guava:15.0'
+ //compile project(path: ':junit', configuration: 'target')
+ }
+} else {
+ dependencies {
+ compile files(findToolsJar())
+ compile project(path: ':antlr', configuration: 'antlrRuntime')
+ compile project(':jsilver')
+ compile project(':tagsoup')
+ }
+}