diff options
| author | The Android Automerger <android-build@android.com> | 2015-01-12 23:47:02 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-01-12 23:47:02 +0000 |
| commit | 0c8d06aaee11bbd8cc439cd11d035f6a0a15bad3 (patch) | |
| tree | 0950545b3c532193b71bb1fa9b1078f8183b1096 | |
| parent | 9848807e578747b1ba1db77e7620cd1d6454df3e (diff) | |
| parent | 3c8eb96ce2491b52cb181295e0481ec593777e0c (diff) | |
| download | sdk-0c8d06aaee11bbd8cc439cd11d035f6a0a15bad3.zip sdk-0c8d06aaee11bbd8cc439cd11d035f6a0a15bad3.tar.gz sdk-0c8d06aaee11bbd8cc439cd11d035f6a0a15bad3.tar.bz2 | |
Merge commit '3c8eb96ce2491b52cb181295e0481ec593777e0c' into studio-master-dev
| -rw-r--r-- | eclipse/build.gradle | 2 | ||||
| -rwxr-xr-x | eclipse/scripts/create_all_symlinks.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/eclipse/build.gradle b/eclipse/build.gradle index 4c7a41c..17bde4f 100644 --- a/eclipse/build.gradle +++ b/eclipse/build.gradle @@ -81,7 +81,7 @@ def artifacts = [ 'jfreechart-swt-1.0.9' : 'jfree:jfreechart-swt:1.0.9', 'kxml2-2.3.0' : 'net.sf.kxml:kxml2:2.3.0', 'liblzf-1.0' : 'com.android.tools.external:liblzf:1.0', - 'lombok-ast-0.2.2' : 'com.android.tools.external.lombok:lombok-ast:0.2.2', + 'lombok-ast-0.2.3' : 'com.android.tools.external.lombok:lombok-ast:0.2.3', 'propertysheet' : 'com.android.tools.external:propertysheet:1.0', ] diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh index ff8a4b0..a78cf1f 100755 --- a/eclipse/scripts/create_all_symlinks.sh +++ b/eclipse/scripts/create_all_symlinks.sh @@ -159,7 +159,7 @@ ADT_PREBUILTS="\ prebuilts/tools/common/m2/repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar \ prebuilts/tools/common/m2/repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar \ prebuilts/tools/common/m2/repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar \ - prebuilts/tools/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.2/lombok-ast-0.2.2.jar" + prebuilts/tools/common/m2/repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" LIBS="$LIBS $ADT_LIBS" CP_FILES="$CP_FILES @:$ADT_DEST $ADT_LIBS $ADT_PREBUILTS" |