Remove the prebuilts for builder.
Xavier Ducrohet [Fri, 21 Dec 2012 02:32:26 +0000 (18:32 -0800)]
Instead use the repo that is the output of publishLocal on
tools/base.

For now those dependencies are still baked into the resulting
builder.jar

Change-Id: Iae0dabfc1932e188218b590170d18401c8df673a

build.gradle
builder/build.gradle
builder/prebuilts/common.jar [deleted file]
builder/prebuilts/layoutlib_api.jar [deleted file]
builder/prebuilts/manifmerger.jar [deleted file]
builder/prebuilts/sdk_common.jar [deleted file]
builder/prebuilts/sdklib.jar [deleted file]

index 1c5c1bc..209d103 100644 (file)
@@ -3,6 +3,7 @@ subprojects {
 
     repositories {
         mavenCentral()
+        maven { url = uri("$rootDir/../base/repo") }
     }
 
     project.ext {
index 8408cf1..dcd70d9 100644 (file)
@@ -2,11 +2,12 @@ apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'signing'
 
-dependencies {
-    // this is temporary
-    compile fileTree(dir: 'prebuilts', include: '*.jar')
+project.ext.baseAndroidVersion = "22.0-SNAPSHOT"
 
-    compile 'com.google.guava:guava:13.0.1'
+dependencies {
+    compile "com.android.tools.sdk:sdklib:$project.ext.baseAndroidVersion"
+    compile "com.android.tools:sdk-common:$project.ext.baseAndroidVersion"
+    compile "com.android.tools.build:manifest-merger:$project.ext.baseAndroidVersion"
 
     testCompile 'junit:junit:3.8.1'
 }
diff --git a/builder/prebuilts/common.jar b/builder/prebuilts/common.jar
deleted file mode 100644 (file)
index 2bb2473..0000000
Binary files a/builder/prebuilts/common.jar and /dev/null differ
diff --git a/builder/prebuilts/layoutlib_api.jar b/builder/prebuilts/layoutlib_api.jar
deleted file mode 100644 (file)
index cd6f17a..0000000
Binary files a/builder/prebuilts/layoutlib_api.jar and /dev/null differ
diff --git a/builder/prebuilts/manifmerger.jar b/builder/prebuilts/manifmerger.jar
deleted file mode 100644 (file)
index d2ad925..0000000
Binary files a/builder/prebuilts/manifmerger.jar and /dev/null differ
diff --git a/builder/prebuilts/sdk_common.jar b/builder/prebuilts/sdk_common.jar
deleted file mode 100644 (file)
index 357543f..0000000
Binary files a/builder/prebuilts/sdk_common.jar and /dev/null differ
diff --git a/builder/prebuilts/sdklib.jar b/builder/prebuilts/sdklib.jar
deleted file mode 100644 (file)
index af69e01..0000000
Binary files a/builder/prebuilts/sdklib.jar and /dev/null differ