diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-06-10 23:30:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-06-10 23:30:37 +0000 |
| commit | 013ba74a2a5a89e371f450ed5a62c50160af3953 (patch) | |
| tree | 2708c77a1563111cc583707b16ffcf5bc053f92e /eclipse/scripts | |
| parent | 2e9239dc9f536b72aa54a743eb58c208654c6ffa (diff) | |
| parent | 4da1c1feb088bfd2754d02a4244530482a6dde3f (diff) | |
| download | sdk-013ba74a2a5a89e371f450ed5a62c50160af3953.tar.gz sdk-013ba74a2a5a89e371f450ed5a62c50160af3953.tar.bz2 sdk-013ba74a2a5a89e371f450ed5a62c50160af3953.zip | |
Merge "Revert back from OSGI -> bundled jars" into idea133
automerge: 4da1c1f
* commit '4da1c1feb088bfd2754d02a4244530482a6dde3f':
Revert back from OSGI -> bundled jars
Diffstat (limited to 'eclipse/scripts')
| -rwxr-xr-x | eclipse/scripts/build_adt.sh | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/eclipse/scripts/build_adt.sh b/eclipse/scripts/build_adt.sh index 0c5792c54..7741da6c9 100755 --- a/eclipse/scripts/build_adt.sh +++ b/eclipse/scripts/build_adt.sh @@ -36,28 +36,11 @@ echo Running gradle to build tools libraries... cd "$ANDROID_SRC"/tools ./gradlew --no-daemon publishLocal -# The following step temporarily disabled: we are running maven in online mode, but it -# actually picks up everything it needs from within the prebuilts or the out folder. The -# current issue is just in creating a local repository that looks as if it has been -# initialized by downloading from a remote repository. - -# 2. Create a combined m2 repository that has the tools generated in step 1 and other prebuilts -# This is required so that maven can be run in offline mode in the next step. -# echo Creating a combined tools + prebuilts maven repo... -# COMBINED_M2_REPO="$ANDROID_SRC"/out/host/maven/toolsRepo -# mkdir -p "$COMBINED_M2_REPO" -# cp -r "$ANDROID_SRC"/out/repo "$COMBINED_M2_REPO" -# cp -r "$ANDROID_SRC"/prebuilts/tools/common/m2/repository/* "$COMBINED_M2_REPO" - -# 3. Convert the generated Maven repository into a p2 repository -echo Converting maven repo to p2 repo... -cd "$ANDROID_SRC"/sdk/p2gen -"$MAVEN" --no-snapshot-updates \ - -P online \ - -Dmaven.repo.local=../../out/host/maven/toolsRepo \ - p2:site +# 2. Copy dependent jars into the libs folder of each plugin +cd "$ANDROID_SRC"/sdk/eclipse +../../tools/gradlew --no-daemon copydeps -# 4. Launch Tycho build +# 3. Launch Tycho build echo Launching Tycho to build ADT plugins and bundle cd "$ANDROID_SRC"/sdk/eclipse make -f maven.mk |