diff options
author | Justin Klaassen <justinklaassen@google.com> | 2017-03-29 14:23:57 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2017-03-29 14:23:57 -0400 |
commit | c41063800ab6f0e3ea15411d9b2858e044b488c3 (patch) | |
tree | a59374d0d167995fe13c1a0f701718d9e2931cc1 | |
parent | 7f82d2e5b52db97e531958e31e2425ee29a55a5b (diff) | |
download | tools-c41063800ab6f0e3ea15411d9b2858e044b488c3.tar.gz |
Import Android SDK Tools 26.0.0
https://dl.google.com/android/repository/sdk-tools-darwin-3841705.zip
Change-Id: Ifa4477ae495e0298a2d4dac7437056c8f7218bcb
-rw-r--r-- | NOTICE.txt | 50 | ||||
-rwxr-xr-x | android | 178 | ||||
-rwxr-xr-x | bin/archquery | 2 | ||||
-rwxr-xr-x | bin/avdmanager | 2 | ||||
-rwxr-xr-x | bin/jobb | 2 | ||||
-rwxr-xr-x | bin/lint | 2 | ||||
-rwxr-xr-x | bin/monkeyrunner | 2 | ||||
-rwxr-xr-x | bin/screenshot2 | 2 | ||||
-rwxr-xr-x | bin/sdkmanager | 2 | ||||
-rwxr-xr-x | bin/uiautomatorviewer | 2 | ||||
-rw-r--r-- | lib/annotations-25.3.1.jar (renamed from lib/annotations-25.3.0.jar) | bin | 4229 -> 4229 bytes | |||
-rw-r--r-- | lib/archquery-25.3.1.jar (renamed from lib/archquery-25.3.0.jar) | bin | 1433 -> 1433 bytes | |||
-rw-r--r-- | lib/asset-studio-25.3.1.jar (renamed from lib/asset-studio-25.3.0.jar) | bin | 1264948 -> 1264948 bytes | |||
-rw-r--r-- | lib/builder-model-2.3.1.jar (renamed from lib/builder-model-2.3.0.jar) | bin | 29224 -> 29224 bytes | |||
-rw-r--r-- | lib/chimpchat-25.3.1.jar (renamed from lib/chimpchat-25.3.0.jar) | bin | 52419 -> 52419 bytes | |||
-rw-r--r-- | lib/common-25.3.1.jar (renamed from lib/common-25.3.0.jar) | bin | 120100 -> 120142 bytes | |||
-rw-r--r-- | lib/ddmlib-25.3.1.jar (renamed from lib/ddmlib-25.3.0.jar) | bin | 320775 -> 320775 bytes | |||
-rw-r--r-- | lib/ddms-25.3.0.jar | bin | 348 -> 0 bytes | |||
-rw-r--r-- | lib/ddms-25.3.1.jar | bin | 0 -> 348 bytes | |||
-rw-r--r-- | lib/ddmuilib-25.3.1.jar (renamed from lib/ddmuilib-25.3.0.jar) | bin | 592349 -> 592349 bytes | |||
-rw-r--r-- | lib/dvlib-25.3.1.jar (renamed from lib/dvlib-25.3.0.jar) | bin | 19918 -> 19918 bytes | |||
-rw-r--r-- | lib/fat32lib.jar | bin | 72245 -> 72245 bytes | |||
-rw-r--r-- | lib/hierarchyviewer2lib-25.3.1.jar (renamed from lib/hierarchyviewer2lib-25.3.0.jar) | bin | 407888 -> 407888 bytes | |||
-rw-r--r-- | lib/jobb-25.3.1.jar (renamed from lib/jobb-25.3.0.jar) | bin | 36392 -> 36392 bytes | |||
-rw-r--r-- | lib/layoutlib-api-25.3.1.jar (renamed from lib/layoutlib-api-25.3.0.jar) | bin | 80653 -> 80653 bytes | |||
-rw-r--r-- | lib/lint-25.3.1.jar (renamed from lib/lint-25.3.0.jar) | bin | 399413 -> 399521 bytes | |||
-rw-r--r-- | lib/lint-api-25.3.1.jar (renamed from lib/lint-api-25.3.0.jar) | bin | 271444 -> 271476 bytes | |||
-rw-r--r-- | lib/lint-checks-25.3.1.jar (renamed from lib/lint-checks-25.3.0.jar) | bin | 911602 -> 911631 bytes | |||
-rw-r--r-- | lib/manifest-merger-25.3.1.jar (renamed from lib/manifest-merger-25.3.0.jar) | bin | 144862 -> 144958 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/artifacts.xml | 110 | ||||
-rw-r--r-- | lib/monitor-x86_64/configuration/config.ini | 4 | ||||
-rw-r--r-- | lib/monitor-x86_64/configuration/org.eclipse.update/platform.xml | 14 | ||||
-rw-r--r-- | lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3841705/META-INF/MANIFEST.MF (renamed from lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3773319/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3841705/feature.xml (renamed from lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3773319/feature.xml) | 10 | ||||
-rw-r--r-- | lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3841705/META-INF/MANIFEST.MF (renamed from lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3773319/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3841705/feature.xml (renamed from lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3773319/feature.xml) | 4 | ||||
-rw-r--r-- | lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3841705/META-INF/MANIFEST.MF (renamed from lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3773319/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3841705/feature.xml (renamed from lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3773319/feature.xml) | 4 | ||||
-rw-r--r-- | lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3841705/META-INF/MANIFEST.MF (renamed from lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3773319/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3841705/feature.xml (renamed from lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3773319/feature.xml) | 4 | ||||
-rw-r--r-- | lib/monitor-x86_64/monitor.app/Contents/Info.plist | 2 | ||||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/artifacts.xml | 6 | ||||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/binary/monitorproduct.executable.cocoa.macosx.x86_64_25.2.2.3841705 (renamed from lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/binary/monitorproduct.executable.cocoa.macosx.x86_64_25.2.2.3773319) | bin | 11069 -> 11072 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/.data/org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions/jvmargs | 2 | ||||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317072642.profile.gz | bin | 378 -> 0 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317072644.profile.gz | bin | 381 -> 0 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229657321.profile.gz | bin | 0 -> 378 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229657323.profile.gz | bin | 0 -> 381 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229658433.profile.gz (renamed from lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317073727.profile.gz) | bin | 79494 -> 79498 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229658632.profile.gz (renamed from lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317073924.profile.gz) | bin | 79491 -> 79495 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/plugins/com.android.ide.eclipse.base_25.2.2.3841705.jar (renamed from lib/monitor-x86_64/plugins/com.android.ide.eclipse.base_25.2.2.3773319.jar) | bin | 4653338 -> 4656041 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/plugins/com.android.ide.eclipse.ddms_25.2.2.3841705.jar (renamed from lib/monitor-x86_64/plugins/com.android.ide.eclipse.ddms_25.2.2.3773319.jar) | bin | 2634176 -> 2634089 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/plugins/com.android.ide.eclipse.gldebugger_25.2.2.3841705.jar (renamed from lib/monitor-x86_64/plugins/com.android.ide.eclipse.gldebugger_25.2.2.3773319.jar) | bin | 520662 -> 520661 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/plugins/com.android.ide.eclipse.monitor_25.2.2.3841705.jar (renamed from lib/monitor-x86_64/plugins/com.android.ide.eclipse.monitor_25.2.2.3773319.jar) | bin | 217828 -> 217826 bytes | |||
-rw-r--r-- | lib/monitor-x86_64/plugins/com.android.ide.eclipse.traceview_25.2.2.3841705.jar (renamed from lib/monitor-x86_64/plugins/com.android.ide.eclipse.traceview_25.2.2.3773319.jar) | bin | 140580 -> 140580 bytes | |||
-rw-r--r-- | lib/monkeyrunner-25.3.1.jar (renamed from lib/monkeyrunner-25.3.0.jar) | bin | 101422 -> 101422 bytes | |||
-rw-r--r-- | lib/repository-25.3.1.jar (renamed from lib/repository-25.3.0.jar) | bin | 204398 -> 204398 bytes | |||
-rw-r--r-- | lib/screenshot2-25.3.1.jar (renamed from lib/screenshot2-25.3.0.jar) | bin | 5307 -> 5307 bytes | |||
-rw-r--r-- | lib/sdk-common-25.3.1.jar (renamed from lib/sdk-common-25.3.0.jar) | bin | 591234 -> 591234 bytes | |||
-rw-r--r-- | lib/sdklib-25.3.1.jar (renamed from lib/sdklib-25.3.0.jar) | bin | 655275 -> 658145 bytes | |||
-rw-r--r-- | lib/swtmenubar-25.3.1.jar (renamed from lib/swtmenubar-25.3.0.jar) | bin | 18632 -> 18632 bytes | |||
-rw-r--r-- | lib/traceview-25.3.1.jar (renamed from lib/traceview-25.3.0.jar) | bin | 136818 -> 136818 bytes | |||
-rw-r--r-- | lib/uast-162.2228.14.jar | bin | 815473 -> 815473 bytes | |||
-rw-r--r-- | lib/uiautomatorviewer-25.3.1.jar (renamed from lib/uiautomatorviewer-25.3.0.jar) | bin | 67721 -> 67721 bytes | |||
-rw-r--r-- | package.xml | 2 | ||||
-rw-r--r-- | source.properties | 2 | ||||
-rw-r--r-- | support/annotations.jar | bin | 1351 -> 1351 bytes |
67 files changed, 289 insertions, 119 deletions
@@ -659,7 +659,7 @@ to a jury trial in any resulting litigation. ============================================================ Notices for file(s): -lib/annotations-25.3.0.jar +lib/annotations-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2013, The Android Open Source Project @@ -854,7 +854,7 @@ lib/annotations-25.3.0.jar ============================================================ Notices for file(s): bin/archquery -lib/archquery-25.3.0.jar +lib/archquery-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -1048,7 +1048,7 @@ lib/archquery-25.3.0.jar ============================================================ Notices for file(s): -lib/asset-studio-25.3.0.jar +lib/asset-studio-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2013, The Android Open Source Project @@ -1242,7 +1242,7 @@ lib/asset-studio-25.3.0.jar ============================================================ Notices for file(s): -lib/builder-model-2.3.0.jar +lib/builder-model-2.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2013, The Android Open Source Project @@ -1436,7 +1436,7 @@ lib/builder-model-2.3.0.jar ============================================================ Notices for file(s): -lib/common-25.3.0.jar +lib/common-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2013, The Android Open Source Project @@ -1630,7 +1630,7 @@ lib/common-25.3.0.jar ============================================================ Notices for file(s): -lib/ddmlib-25.3.0.jar +lib/ddmlib-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -1824,7 +1824,7 @@ lib/ddmlib-25.3.0.jar ============================================================ Notices for file(s): -lib/dvlib-25.3.0.jar +lib/dvlib-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2013, The Android Open Source Project @@ -2019,7 +2019,7 @@ lib/dvlib-25.3.0.jar ============================================================ Notices for file(s): bin/jobb -lib/jobb-25.3.0.jar +lib/jobb-25.3.1.jar ------------------------------------------------------------ Portions of this code: ------------------------------------------------------------------------------- @@ -2073,7 +2073,7 @@ limitations under the License. ============================================================ Notices for file(s): -lib/layoutlib-api-25.3.0.jar +lib/layoutlib-api-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -2267,7 +2267,7 @@ lib/layoutlib-api-25.3.0.jar ============================================================ Notices for file(s): -lib/lint-25.3.0.jar +lib/lint-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2011, The Android Open Source Project @@ -2461,7 +2461,7 @@ lib/lint-25.3.0.jar ============================================================ Notices for file(s): -lib/lint-api-25.3.0.jar +lib/lint-api-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2011, The Android Open Source Project @@ -2655,7 +2655,7 @@ lib/lint-api-25.3.0.jar ============================================================ Notices for file(s): -lib/lint-checks-25.3.0.jar +lib/lint-checks-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2011, The Android Open Source Project @@ -2849,7 +2849,7 @@ lib/lint-checks-25.3.0.jar ============================================================ Notices for file(s): -lib/manifest-merger-25.3.0.jar +lib/manifest-merger-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2011, The Android Open Source Project @@ -3043,7 +3043,7 @@ lib/manifest-merger-25.3.0.jar ============================================================ Notices for file(s): -lib/repository-25.3.0.jar +lib/repository-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2011, The Android Open Source Project @@ -3238,7 +3238,7 @@ lib/repository-25.3.0.jar ============================================================ Notices for file(s): bin/screenshot2 -lib/screenshot2-25.3.0.jar +lib/screenshot2-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -3432,7 +3432,7 @@ lib/screenshot2-25.3.0.jar ============================================================ Notices for file(s): -lib/sdk-common-25.3.0.jar +lib/sdk-common-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -3626,7 +3626,7 @@ lib/sdk-common-25.3.0.jar ============================================================ Notices for file(s): -lib/sdklib-25.3.0.jar +lib/sdklib-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -4159,7 +4159,7 @@ support/annotations.jar ============================================================ Notices for file(s): -lib/chimpchat-25.3.0.jar +lib/chimpchat-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2011, The Android Open Source Project @@ -4353,7 +4353,7 @@ lib/chimpchat-25.3.0.jar ============================================================ Notices for file(s): -lib/ddms-25.3.0.jar +lib/ddms-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -4547,7 +4547,7 @@ lib/ddms-25.3.0.jar ============================================================ Notices for file(s): -lib/ddmuilib-25.3.0.jar +lib/ddmuilib-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -4741,7 +4741,7 @@ lib/ddmuilib-25.3.0.jar ============================================================ Notices for file(s): -lib/hierarchyviewer2lib-25.3.0.jar +lib/hierarchyviewer2lib-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -4936,7 +4936,7 @@ lib/hierarchyviewer2lib-25.3.0.jar ============================================================ Notices for file(s): bin/monkeyrunner -lib/monkeyrunner-25.3.0.jar +lib/monkeyrunner-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -5130,7 +5130,7 @@ lib/monkeyrunner-25.3.0.jar ============================================================ Notices for file(s): -lib/swtmenubar-25.3.0.jar +lib/swtmenubar-25.3.1.jar ------------------------------------------------------------ *Eclipse Public License - v 1.0* @@ -5358,7 +5358,7 @@ to a jury trial in any resulting litigation. ============================================================ Notices for file(s): -lib/traceview-25.3.0.jar +lib/traceview-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -5553,7 +5553,7 @@ lib/traceview-25.3.0.jar ============================================================ Notices for file(s): bin/uiautomatorviewer -lib/uiautomatorviewer-25.3.0.jar +lib/uiautomatorviewer-25.3.1.jar ------------------------------------------------------------ Copyright (c) 2005-2008, The Android Open Source Project @@ -1,5 +1,175 @@ #!/bin/bash -echo The "android" command is no longer available. -echo For manual SDK and AVD management, please use Android Studio. -echo For command-line tools, use tools/bin/sdkmanager and tools/bin/avdmanager -exit 1 + +# Attempt to set app_home +# Resolve links: $0 may be a link +prg="$0" +# Need this for relative symlinks. +while [ -h "$prg" ] ; do + ls=`ls -ld "$prg"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + prg="$link" + else + prg=`dirname "$prg"`"/$link" + fi +done +saved="`pwd`" +cd "`dirname \"$prg\"`" >/dev/null +app_home="`pwd -P`" +cd "$saved" >/dev/null + +ANDROID_WRAPPER_BIN_DIR=${ANDROID_WRAPPER_BIN_DIR:-$app_home/bin} +ANDROID_WRAPPER_SDK_TIMEOUT=${ANDROID_WRAPPER_SDK_TIMEOUT:-20} + +cat <<< \ +"************************************************************************* +The \"android\" command is deprecated. +For manual SDK, AVD, and project management, please use Android Studio. +For command-line tools, use tools/bin/sdkmanager and tools/bin/avdmanager +*************************************************************************" + +function usage { + echo "Invalid or unsupported command \"$@\"" + echo + echo "Supported commands are:" + echo "android list target" + echo "android list avd" + echo "android list device" + echo "android create avd" + echo "android move avd" + echo "android delete avd" + echo "android list sdk" + echo "android update sdk" + exit 2 +} + +function matches { + verbs=$1 + objects=$2 + verb="" + object="" + shift 2 + + for arg in "$@"; do + if [[ $arg =~ ^- ]]; then + continue + fi + if [[ -z $verb && $verbs =~ ( |^)$arg( |$) ]]; then + verb=$arg + continue + fi + if [[ -n $verb && $objects =~ ( |^)$arg( |$) ]]; then + object=$arg + break + fi + break + done + return $([[ -n $verb && -n $object ]]) +} + +function echo_and_exec { + echo "Running $@" + echo + exec $@ +} + +function parse_filter { + local IFS=, + for filter in $1; do + if [[ $filter == tool || $filter == platform-tool || $filter == doc ]]; then + command+=( "$args ${filter}s" ) + elif [[ $filter == tools || $filter == platform-tools ]]; then + command+=( "$args ${filter}" ) + elif [[ $filter =~ ^lldb ]]; then + command+=( "$args ${filter/-/;}" ) + elif [[ $filter =~ ^build-tools ]]; then + command+=( "$args ${filter/build-tools-/build-tools;}" ) + elif [[ $filter == ndk ]]; then + command+=( "$args ndk-bundle" ) + elif [[ $filter =~ ^android- ]]; then + command+=( "$args platforms;$filter" ) + else + echo Filter $filter not supported + exit 2 + fi + done +} + +function confirm_try_sdk { + for arg in "$@"; do + if [[ $arg == --use-sdk-wrapper ]]; then + return 0 + fi + done + if [[ -n $USE_SDK_WRAPPER ]]; then + return 0 + fi + read -t $ANDROID_WRAPPER_SDK_TIMEOUT -p "\"android\" SDK commands can be translated to sdkmanager commands on a best-effort basis. +Continue? (This prompt can be suppressed with the --use-sdk-wrapper command-line argument +or by setting the USE_SDK_WRAPPER environment variable) [y/N]: " trysdkresponse + if (( $? > 128 )); then + echo "Timed out waiting for input." + echo "To suppress this prompt, run with --use-sdk-wrapper or set USE_SDK_WRAPPER." + exit 1 + fi + if [[ ${trysdkresponse,,} == y ]]; then + return 0 + fi + echo Aborted + exit 1 +} + +avd_verbs="list create move delete" +avd_objects="avd target device" + +if matches "$avd_verbs" "$avd_objects" "$@"; then + echo_and_exec "$ANDROID_WRAPPER_BIN_DIR/avdmanager" "$@" +fi + +sdk_verbs="list update" +sdk_objects="sdk" + +if matches "$sdk_verbs" "$sdk_objects" "$@"; then + confirm_try_sdk $@ + if [[ $verb == list ]]; then + echo_and_exec "$ANDROID_WRAPPER_BIN_DIR/sdkmanager" --list --verbose + fi + if [[ $verb == update ]]; then + command=( "$ANDROID_WRAPPER_BIN_DIR/sdkmanager" ) + prev="" + update_all=1 + for arg in "$@"; do + if [[ $arg == --use-sdk-wrapper || $arg == $verb || $arg == $object ]]; then + continue + elif [[ $arg == -n ]]; then + echo "update sdk -n is not supported" + exit 2 + elif [[ $arg == -s || $arg == --no-https ]]; then + command+=("--no_https") + elif [[ $arg == -a || $arg == --all ]]; then + command+=("--include_obsolete") + elif [[ $arg == -p || $arg == --obsolete || $arg == -u || $arg == --no-ui || $arg == --proxy-host || + $arg == --proxy-port || $arg == -t || $arg == --filter ]]; then + : + elif [[ $prev == --proxy-host ]]; then + command+=("--proxy=http" "--proxy_host=$arg") + elif [[ $prev == --proxy-port ]]; then + command+=("--proxy_port=$arg") + elif [[ $prev == -t || $prev == --filter ]]; then + update_all= + parse_filter $arg + else + echo Unrecognized argument $arg + exit 2 + fi + + prev=$arg + done + if [[ -n $update_all ]]; then + command+=("--update") + fi + echo_and_exec ${command[@]} + fi +fi + +usage $@ diff --git a/bin/archquery b/bin/archquery index f3fa640..29d8a2c 100755 --- a/bin/archquery +++ b/bin/archquery @@ -64,7 +64,7 @@ case "`uname`" in ;; esac -CLASSPATH=$APP_HOME/lib/archquery-25.3.0.jar +CLASSPATH=$APP_HOME/lib/archquery-25.3.1.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then diff --git a/bin/avdmanager b/bin/avdmanager index 99311d6..836e5f8 100755 --- a/bin/avdmanager +++ b/bin/avdmanager @@ -64,7 +64,7 @@ case "`uname`" in ;; esac -CLASSPATH=$APP_HOME/lib/sdklib-25.3.0.jar:$APP_HOME/lib/layoutlib-api-25.3.0.jar:$APP_HOME/lib/dvlib-25.3.0.jar:$APP_HOME/lib/repository-25.3.0.jar:$APP_HOME/lib/gson-2.2.4.jar:$APP_HOME/lib/commons-compress-1.8.1.jar:$APP_HOME/lib/httpclient-4.1.1.jar:$APP_HOME/lib/httpmime-4.1.jar:$APP_HOME/lib/common-25.3.0.jar:$APP_HOME/lib/kxml2-2.3.0.jar:$APP_HOME/lib/annotations-25.3.0.jar:$APP_HOME/lib/annotations-12.0.jar:$APP_HOME/lib/jimfs-1.1.jar:$APP_HOME/lib/httpcore-4.1.jar:$APP_HOME/lib/commons-logging-1.1.1.jar:$APP_HOME/lib/commons-codec-1.4.jar:$APP_HOME/lib/guava-18.0.jar +CLASSPATH=$APP_HOME/lib/sdklib-25.3.1.jar:$APP_HOME/lib/layoutlib-api-25.3.1.jar:$APP_HOME/lib/dvlib-25.3.1.jar:$APP_HOME/lib/repository-25.3.1.jar:$APP_HOME/lib/gson-2.2.4.jar:$APP_HOME/lib/commons-compress-1.8.1.jar:$APP_HOME/lib/httpclient-4.1.1.jar:$APP_HOME/lib/httpmime-4.1.jar:$APP_HOME/lib/common-25.3.1.jar:$APP_HOME/lib/kxml2-2.3.0.jar:$APP_HOME/lib/annotations-25.3.1.jar:$APP_HOME/lib/annotations-12.0.jar:$APP_HOME/lib/jimfs-1.1.jar:$APP_HOME/lib/httpcore-4.1.jar:$APP_HOME/lib/commons-logging-1.1.1.jar:$APP_HOME/lib/commons-codec-1.4.jar:$APP_HOME/lib/guava-18.0.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then @@ -64,7 +64,7 @@ case "`uname`" in ;; esac -CLASSPATH=$APP_HOME/lib/jobb-25.3.0.jar:$APP_HOME/lib/fat32lib.jar +CLASSPATH=$APP_HOME/lib/jobb-25.3.1.jar:$APP_HOME/lib/fat32lib.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then @@ -64,7 +64,7 @@ case "`uname`" in ;; esac -CLASSPATH=$APP_HOME/lib/lint-25.3.0.jar:$APP_HOME/lib/lint-checks-25.3.0.jar:$APP_HOME/lib/ecj-4.6.1.jar:$APP_HOME/lib/lint-api-25.3.0.jar:$APP_HOME/lib/asm-analysis-5.0.4.jar:$APP_HOME/lib/sdk-common-25.3.0.jar:$APP_HOME/lib/builder-model-2.3.0.jar:$APP_HOME/lib/uast-162.2228.14.jar:$APP_HOME/lib/lombok-ast-0.2.3.jar:$APP_HOME/lib/asm-5.0.4.jar:$APP_HOME/lib/asm-tree-5.0.4.jar:$APP_HOME/lib/sdklib-25.3.0.jar:$APP_HOME/lib/builder-test-api-2.3.0.jar:$APP_HOME/lib/bcpkix-jdk15on-1.48.jar:$APP_HOME/lib/bcprov-jdk15on-1.48.jar:$APP_HOME/lib/annotations-25.3.0.jar:$APP_HOME/lib/layoutlib-api-25.3.0.jar:$APP_HOME/lib/dvlib-25.3.0.jar:$APP_HOME/lib/repository-25.3.0.jar:$APP_HOME/lib/gson-2.2.4.jar:$APP_HOME/lib/commons-compress-1.8.1.jar:$APP_HOME/lib/httpclient-4.1.1.jar:$APP_HOME/lib/httpmime-4.1.jar:$APP_HOME/lib/ddmlib-25.3.0.jar:$APP_HOME/lib/common-25.3.0.jar:$APP_HOME/lib/kxml2-2.3.0.jar:$APP_HOME/lib/annotations-12.0.jar:$APP_HOME/lib/jimfs-1.1.jar:$APP_HOME/lib/httpcore-4.1.jar:$APP_HOME/lib/commons-logging-1.1.1.jar:$APP_HOME/lib/commons-codec-1.4.jar:$APP_HOME/lib/guava-18.0.jar +CLASSPATH=$APP_HOME/lib/lint-25.3.1.jar:$APP_HOME/lib/lint-checks-25.3.1.jar:$APP_HOME/lib/ecj-4.6.1.jar:$APP_HOME/lib/lint-api-25.3.1.jar:$APP_HOME/lib/asm-analysis-5.0.4.jar:$APP_HOME/lib/sdk-common-25.3.1.jar:$APP_HOME/lib/builder-model-2.3.1.jar:$APP_HOME/lib/uast-162.2228.14.jar:$APP_HOME/lib/lombok-ast-0.2.3.jar:$APP_HOME/lib/asm-5.0.4.jar:$APP_HOME/lib/asm-tree-5.0.4.jar:$APP_HOME/lib/sdklib-25.3.1.jar:$APP_HOME/lib/builder-test-api-2.3.1.jar:$APP_HOME/lib/bcpkix-jdk15on-1.48.jar:$APP_HOME/lib/bcprov-jdk15on-1.48.jar:$APP_HOME/lib/annotations-25.3.1.jar:$APP_HOME/lib/layoutlib-api-25.3.1.jar:$APP_HOME/lib/dvlib-25.3.1.jar:$APP_HOME/lib/repository-25.3.1.jar:$APP_HOME/lib/gson-2.2.4.jar:$APP_HOME/lib/commons-compress-1.8.1.jar:$APP_HOME/lib/httpclient-4.1.1.jar:$APP_HOME/lib/httpmime-4.1.jar:$APP_HOME/lib/ddmlib-25.3.1.jar:$APP_HOME/lib/common-25.3.1.jar:$APP_HOME/lib/kxml2-2.3.0.jar:$APP_HOME/lib/annotations-12.0.jar:$APP_HOME/lib/jimfs-1.1.jar:$APP_HOME/lib/httpcore-4.1.jar:$APP_HOME/lib/commons-logging-1.1.1.jar:$APP_HOME/lib/commons-codec-1.4.jar:$APP_HOME/lib/guava-18.0.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then diff --git a/bin/monkeyrunner b/bin/monkeyrunner index 8a2fab7..ce7eb2d 100755 --- a/bin/monkeyrunner +++ b/bin/monkeyrunner @@ -35,7 +35,7 @@ cd "${oldwd}" frameworkdir="$progdir" libdir="$progdir" -jarfile=`basename "$APP_HOME/lib/monkeyrunner-25.3.0.jar"` +jarfile=`basename "$APP_HOME/lib/monkeyrunner-25.3.1.jar"` if [ ! -r "$frameworkdir/${jarfile}" ] then frameworkdir="$progdir"/lib diff --git a/bin/screenshot2 b/bin/screenshot2 index 27c90c6..9aaf2e6 100755 --- a/bin/screenshot2 +++ b/bin/screenshot2 @@ -64,7 +64,7 @@ case "`uname`" in ;; esac -CLASSPATH=$APP_HOME/lib/screenshot2-25.3.0.jar:$APP_HOME/lib/ddmlib-25.3.0.jar:$APP_HOME/lib/common-25.3.0.jar:$APP_HOME/lib/kxml2-2.3.0.jar:$APP_HOME/lib/annotations-25.3.0.jar:$APP_HOME/lib/guava-18.0.jar +CLASSPATH=$APP_HOME/lib/screenshot2-25.3.1.jar:$APP_HOME/lib/ddmlib-25.3.1.jar:$APP_HOME/lib/common-25.3.1.jar:$APP_HOME/lib/kxml2-2.3.0.jar:$APP_HOME/lib/annotations-25.3.1.jar:$APP_HOME/lib/guava-18.0.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then diff --git a/bin/sdkmanager b/bin/sdkmanager index e9eaba8..0f8bb91 100755 --- a/bin/sdkmanager +++ b/bin/sdkmanager @@ -64,7 +64,7 @@ case "`uname`" in ;; esac -CLASSPATH=$APP_HOME/lib/sdklib-25.3.0.jar:$APP_HOME/lib/layoutlib-api-25.3.0.jar:$APP_HOME/lib/dvlib-25.3.0.jar:$APP_HOME/lib/repository-25.3.0.jar:$APP_HOME/lib/gson-2.2.4.jar:$APP_HOME/lib/commons-compress-1.8.1.jar:$APP_HOME/lib/httpclient-4.1.1.jar:$APP_HOME/lib/httpmime-4.1.jar:$APP_HOME/lib/common-25.3.0.jar:$APP_HOME/lib/kxml2-2.3.0.jar:$APP_HOME/lib/annotations-25.3.0.jar:$APP_HOME/lib/annotations-12.0.jar:$APP_HOME/lib/jimfs-1.1.jar:$APP_HOME/lib/httpcore-4.1.jar:$APP_HOME/lib/commons-logging-1.1.1.jar:$APP_HOME/lib/commons-codec-1.4.jar:$APP_HOME/lib/guava-18.0.jar +CLASSPATH=$APP_HOME/lib/sdklib-25.3.1.jar:$APP_HOME/lib/layoutlib-api-25.3.1.jar:$APP_HOME/lib/dvlib-25.3.1.jar:$APP_HOME/lib/repository-25.3.1.jar:$APP_HOME/lib/gson-2.2.4.jar:$APP_HOME/lib/commons-compress-1.8.1.jar:$APP_HOME/lib/httpclient-4.1.1.jar:$APP_HOME/lib/httpmime-4.1.jar:$APP_HOME/lib/common-25.3.1.jar:$APP_HOME/lib/kxml2-2.3.0.jar:$APP_HOME/lib/annotations-25.3.1.jar:$APP_HOME/lib/annotations-12.0.jar:$APP_HOME/lib/jimfs-1.1.jar:$APP_HOME/lib/httpcore-4.1.jar:$APP_HOME/lib/commons-logging-1.1.1.jar:$APP_HOME/lib/commons-codec-1.4.jar:$APP_HOME/lib/guava-18.0.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then diff --git a/bin/uiautomatorviewer b/bin/uiautomatorviewer index c181983..0512360 100755 --- a/bin/uiautomatorviewer +++ b/bin/uiautomatorviewer @@ -35,7 +35,7 @@ progdir=`pwd` prog="${progdir}"/bin/"${progname}" cd "${oldwd}" -jarfile=`basename $APP_HOME/lib/uiautomatorviewer-25.3.0.jar` +jarfile=`basename $APP_HOME/lib/uiautomatorviewer-25.3.1.jar` frameworkdir="$progdir" libdir="$progdir" if [ ! -r "$frameworkdir/$jarfile" ] diff --git a/lib/annotations-25.3.0.jar b/lib/annotations-25.3.1.jar Binary files differindex 6b424f5..8855be0 100644 --- a/lib/annotations-25.3.0.jar +++ b/lib/annotations-25.3.1.jar diff --git a/lib/archquery-25.3.0.jar b/lib/archquery-25.3.1.jar Binary files differindex 95d76f0..27cefa6 100644 --- a/lib/archquery-25.3.0.jar +++ b/lib/archquery-25.3.1.jar diff --git a/lib/asset-studio-25.3.0.jar b/lib/asset-studio-25.3.1.jar Binary files differindex 5532df0..21a497c 100644 --- a/lib/asset-studio-25.3.0.jar +++ b/lib/asset-studio-25.3.1.jar diff --git a/lib/builder-model-2.3.0.jar b/lib/builder-model-2.3.1.jar Binary files differindex 5112fd6..3dcbf2c 100644 --- a/lib/builder-model-2.3.0.jar +++ b/lib/builder-model-2.3.1.jar diff --git a/lib/chimpchat-25.3.0.jar b/lib/chimpchat-25.3.1.jar Binary files differindex fb08af2..2f61d71 100644 --- a/lib/chimpchat-25.3.0.jar +++ b/lib/chimpchat-25.3.1.jar diff --git a/lib/common-25.3.0.jar b/lib/common-25.3.1.jar Binary files differindex 37c7f72..bba89fa 100644 --- a/lib/common-25.3.0.jar +++ b/lib/common-25.3.1.jar diff --git a/lib/ddmlib-25.3.0.jar b/lib/ddmlib-25.3.1.jar Binary files differindex db0c1ef..31d51c3 100644 --- a/lib/ddmlib-25.3.0.jar +++ b/lib/ddmlib-25.3.1.jar diff --git a/lib/ddms-25.3.0.jar b/lib/ddms-25.3.0.jar Binary files differdeleted file mode 100644 index aa93616..0000000 --- a/lib/ddms-25.3.0.jar +++ /dev/null diff --git a/lib/ddms-25.3.1.jar b/lib/ddms-25.3.1.jar Binary files differnew file mode 100644 index 0000000..fe7edc9 --- /dev/null +++ b/lib/ddms-25.3.1.jar diff --git a/lib/ddmuilib-25.3.0.jar b/lib/ddmuilib-25.3.1.jar Binary files differindex 84470e3..7764b7e 100644 --- a/lib/ddmuilib-25.3.0.jar +++ b/lib/ddmuilib-25.3.1.jar diff --git a/lib/dvlib-25.3.0.jar b/lib/dvlib-25.3.1.jar Binary files differindex bd44d6e..2da3bae 100644 --- a/lib/dvlib-25.3.0.jar +++ b/lib/dvlib-25.3.1.jar diff --git a/lib/fat32lib.jar b/lib/fat32lib.jar Binary files differindex 42640ee..97656a1 100644 --- a/lib/fat32lib.jar +++ b/lib/fat32lib.jar diff --git a/lib/hierarchyviewer2lib-25.3.0.jar b/lib/hierarchyviewer2lib-25.3.1.jar Binary files differindex 5043f01..6029597 100644 --- a/lib/hierarchyviewer2lib-25.3.0.jar +++ b/lib/hierarchyviewer2lib-25.3.1.jar diff --git a/lib/jobb-25.3.0.jar b/lib/jobb-25.3.1.jar Binary files differindex 2ba3297..ff24f15 100644 --- a/lib/jobb-25.3.0.jar +++ b/lib/jobb-25.3.1.jar diff --git a/lib/layoutlib-api-25.3.0.jar b/lib/layoutlib-api-25.3.1.jar Binary files differindex 08bdd7b..1a1a6ed 100644 --- a/lib/layoutlib-api-25.3.0.jar +++ b/lib/layoutlib-api-25.3.1.jar diff --git a/lib/lint-25.3.0.jar b/lib/lint-25.3.1.jar Binary files differindex d6c20f5..d4d379d 100644 --- a/lib/lint-25.3.0.jar +++ b/lib/lint-25.3.1.jar diff --git a/lib/lint-api-25.3.0.jar b/lib/lint-api-25.3.1.jar Binary files differindex a1b8af1..ee12f72 100644 --- a/lib/lint-api-25.3.0.jar +++ b/lib/lint-api-25.3.1.jar diff --git a/lib/lint-checks-25.3.0.jar b/lib/lint-checks-25.3.1.jar Binary files differindex b5f279f..cf011a0 100644 --- a/lib/lint-checks-25.3.0.jar +++ b/lib/lint-checks-25.3.1.jar diff --git a/lib/manifest-merger-25.3.0.jar b/lib/manifest-merger-25.3.1.jar Binary files differindex 8efa409..89581b7 100644 --- a/lib/manifest-merger-25.3.0.jar +++ b/lib/manifest-merger-25.3.1.jar diff --git a/lib/monitor-x86_64/artifacts.xml b/lib/monitor-x86_64/artifacts.xml index 6e87a5d..af97b8e 100644 --- a/lib/monitor-x86_64/artifacts.xml +++ b/lib/monitor-x86_64/artifacts.xml @@ -3,7 +3,7 @@ <repository name='Bundle pool' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'> <properties size='2'> <property name='p2.system' value='true'/> - <property name='p2.timestamp' value='1488317073214'/> + <property name='p2.timestamp' value='1490229657916'/> </properties> <mappings size='3'> <rule filter='(& (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/> @@ -11,14 +11,6 @@ <rule filter='(& (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/> </mappings> <artifacts size='201'> - <artifact classifier='org.eclipse.update.feature' id='com.android.ide.eclipse.gldebugger.feature' version='25.2.2.3773319'> - <properties size='1'> - <property name='download.size' value='4750'/> - </properties> - <repositoryProperties size='1'> - <property name='artifact.folder' value='true'/> - </repositoryProperties> - </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.e4.ui.workbench.addons.swt' version='0.10.3.v20130124-185622'> <properties size='1'> <property name='download.size' value='132003'/> @@ -57,14 +49,6 @@ <property name='download.size' value='32030'/> </properties> </artifact> - <artifact classifier='org.eclipse.update.feature' id='com.android.ide.eclipse.ddms.feature' version='25.2.2.3773319'> - <properties size='1'> - <property name='download.size' value='5054'/> - </properties> - <repositoryProperties size='1'> - <property name='artifact.folder' value='true'/> - </repositoryProperties> - </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.equinox.preferences' version='3.5.1.v20121031-182809'> <properties size='1'> <property name='download.size' value='126754'/> @@ -251,6 +235,14 @@ <property name='download.size' value='521522'/> </properties> </artifact> + <artifact classifier='org.eclipse.update.feature' id='com.android.ide.eclipse.traceview.feature' version='25.2.2.3841705'> + <properties size='1'> + <property name='download.size' value='4828'/> + </properties> + <repositoryProperties size='1'> + <property name='artifact.folder' value='true'/> + </repositoryProperties> + </artifact> <artifact classifier='osgi.bundle' id='javax.servlet' version='3.0.0.v201112011016'> <properties size='1'> <property name='download.size' value='201594'/> @@ -284,6 +276,14 @@ <property name='download.size' value='16989'/> </properties> </artifact> + <artifact classifier='org.eclipse.update.feature' id='com.android.ide.eclipse.gldebugger.feature' version='25.2.2.3841705'> + <properties size='1'> + <property name='download.size' value='4749'/> + </properties> + <repositoryProperties size='1'> + <property name='artifact.folder' value='true'/> + </repositoryProperties> + </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.equinox.http.servlet' version='1.1.300.v20120912-130548'> <properties size='1'> <property name='download.size' value='45071'/> @@ -304,11 +304,6 @@ <property name='download.size' value='33750'/> </properties> </artifact> - <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.monitor' version='25.2.2.3773319'> - <properties size='1'> - <property name='download.size' value='217828'/> - </properties> - </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.e4.core.contexts' version='1.2.0.v20121221-192508'> <properties size='1'> <property name='download.size' value='48057'/> @@ -324,6 +319,11 @@ <property name='download.size' value='346425'/> </properties> </artifact> + <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.ddms' version='25.2.2.3841705'> + <properties size='1'> + <property name='download.size' value='2634089'/> + </properties> + </artifact> <artifact classifier='osgi.bundle' id='javax.inject' version='1.0.0.v20091030'> <properties size='1'> <property name='download.size' value='12288'/> @@ -404,6 +404,11 @@ <property name='download.size' value='107463'/> </properties> </artifact> + <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.monitor' version='25.2.2.3841705'> + <properties size='1'> + <property name='download.size' value='217826'/> + </properties> + </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.osgi.util' version='3.2.300.v20120913-144807'> <properties size='1'> <property name='download.size' value='24979'/> @@ -470,14 +475,6 @@ <property name='download.size' value='13390'/> </properties> </artifact> - <artifact classifier='org.eclipse.update.feature' id='com.android.ide.eclipse.traceview.feature' version='25.2.2.3773319'> - <properties size='1'> - <property name='download.size' value='4828'/> - </properties> - <repositoryProperties size='1'> - <property name='artifact.folder' value='true'/> - </repositoryProperties> - </artifact> <artifact classifier='osgi.bundle' id='org.apache.ant' version='1.8.3.v201301120609'> <properties size='1'> <property name='download.size' value='2359356'/> @@ -584,11 +581,6 @@ <property name='download.size' value='241154'/> </properties> </artifact> - <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.ddms' version='25.2.2.3773319'> - <properties size='1'> - <property name='download.size' value='2634176'/> - </properties> - </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.team.ui' version='3.6.201.v20130125-135424'> <properties size='1'> <property name='download.size' value='1445067'/> @@ -599,6 +591,11 @@ <property name='download.size' value='237996'/> </properties> </artifact> + <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.gldebugger' version='25.2.2.3841705'> + <properties size='1'> + <property name='download.size' value='520661'/> + </properties> + </artifact> <artifact classifier='org.eclipse.update.feature' id='org.eclipse.equinox.p2.core.feature' version='1.1.0.v20121211-153934-8297FndFWmE7h7Bpz-vcqkxyKz0'> <properties size='1'> <property name='download.size' value='31326'/> @@ -690,14 +687,6 @@ <property name='download.size' value='90633'/> </properties> </artifact> - <artifact classifier='org.eclipse.update.feature' id='com.android.ide.eclipse.monitor.feature' version='25.2.2.3773319'> - <properties size='1'> - <property name='download.size' value='4866'/> - </properties> - <repositoryProperties size='1'> - <property name='artifact.folder' value='true'/> - </repositoryProperties> - </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.equinox.p2.directorywatcher' version='1.0.300.v20110808-1657'> <properties size='1'> <property name='download.size' value='33783'/> @@ -751,11 +740,6 @@ <property name='artifact.folder' value='true'/> </repositoryProperties> </artifact> - <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.gldebugger' version='25.2.2.3773319'> - <properties size='1'> - <property name='download.size' value='520662'/> - </properties> - </artifact> <artifact classifier='osgi.bundle' id='org.apache.felix.gogo.runtime' version='0.8.0.v201108120515'> <properties size='1'> <property name='download.size' value='80002'/> @@ -834,11 +818,6 @@ <property name='download.size' value='6701200'/> </properties> </artifact> - <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.base' version='25.2.2.3773319'> - <properties size='1'> - <property name='download.size' value='4653338'/> - </properties> - </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.ui.cheatsheets' version='3.4.200.v20120521-2344'> <properties size='1'> <property name='download.size' value='330211'/> @@ -849,6 +828,11 @@ <property name='download.size' value='111094'/> </properties> </artifact> + <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.traceview' version='25.2.2.3841705'> + <properties size='1'> + <property name='download.size' value='140580'/> + </properties> + </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.jetty.http' version='8.1.3.v20120522'> <properties size='1'> <property name='download.size' value='101528'/> @@ -932,6 +916,14 @@ <property name='artifact.folder' value='true'/> </repositoryProperties> </artifact> + <artifact classifier='org.eclipse.update.feature' id='com.android.ide.eclipse.monitor.feature' version='25.2.2.3841705'> + <properties size='1'> + <property name='download.size' value='4866'/> + </properties> + <repositoryProperties size='1'> + <property name='artifact.folder' value='true'/> + </repositoryProperties> + </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.e4.core.commands' version='0.10.1.v20120523-1955'> <properties size='1'> <property name='download.size' value='18234'/> @@ -950,9 +942,17 @@ <property name='artifact.folder' value='true'/> </repositoryProperties> </artifact> - <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.traceview' version='25.2.2.3773319'> + <artifact classifier='org.eclipse.update.feature' id='com.android.ide.eclipse.ddms.feature' version='25.2.2.3841705'> <properties size='1'> - <property name='download.size' value='140580'/> + <property name='download.size' value='5053'/> + </properties> + <repositoryProperties size='1'> + <property name='artifact.folder' value='true'/> + </repositoryProperties> + </artifact> + <artifact classifier='osgi.bundle' id='com.android.ide.eclipse.base' version='25.2.2.3841705'> + <properties size='1'> + <property name='download.size' value='4656041'/> </properties> </artifact> <artifact classifier='osgi.bundle' id='org.eclipse.core.variables' version='3.2.600.v20120521-2012'> diff --git a/lib/monitor-x86_64/configuration/config.ini b/lib/monitor-x86_64/configuration/config.ini index 2d436b8..ae609d8 100644 --- a/lib/monitor-x86_64/configuration/config.ini +++ b/lib/monitor-x86_64/configuration/config.ini @@ -1,9 +1,9 @@ #This configuration file was written by: org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser -#Tue Feb 28 13:24:33 PST 2017 +#Wed Mar 22 17:40:58 PDT 2017 eclipse.p2.profile=DefaultProfile osgi.framework=file\:plugins/org.eclipse.osgi_3.8.2.v20130124-134944.jar equinox.use.ds=true -osgi.bundles=reference\:file\:com.android.ide.eclipse.base_25.2.2.3773319.jar@4,reference\:file\:com.android.ide.eclipse.ddms_25.2.2.3773319.jar@4,reference\:file\:com.android.ide.eclipse.gldebugger_25.2.2.3773319.jar@4,reference\:file\:com.android.ide.eclipse.monitor_25.2.2.3773319.jar@4,reference\:file\:com.android.ide.eclipse.traceview_25.2.2.3773319.jar@4,reference\:file\:com.ibm.icu_4.4.2.v20110823.jar@4,reference\:file\:com.jcraft.jsch_0.1.46.v201205102330.jar@4,reference\:file\:com.sun.el_2.2.0.v201108011116.jar@4,reference\:file\:javax.annotation_1.0.0.v20101115-0725.jar@4,reference\:file\:javax.el_2.2.0.v201108011116.jar@4,reference\:file\:javax.inject_1.0.0.v20091030.jar@4,reference\:file\:javax.servlet_3.0.0.v201112011016.jar@4,reference\:file\:javax.servlet.jsp_2.2.0.v201112011158.jar@4,reference\:file\:javax.xml_1.3.4.v201005080400.jar@4,reference\:file\:org.apache.ant_1.8.3.v201301120609/@4,reference\:file\:org.apache.batik.css_1.6.0.v201011041432.jar@4,reference\:file\:org.apache.batik.util_1.6.0.v201011041432.jar@4,reference\:file\:org.apache.batik.util.gui_1.6.0.v201011041432.jar@4,reference\:file\:org.apache.commons.codec_1.3.0.v201101211617.jar@4,reference\:file\:org.apache.commons.httpclient_3.1.0.v201012070820.jar@4,reference\:file\:org.apache.commons.logging_1.0.4.v201101211617.jar@4,reference\:file\:org.apache.felix.gogo.command_0.8.0.v201108120515.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.8.0.v201110170705.jar@4,reference\:file\:org.apache.jasper.glassfish_2.2.2.v201205150955.jar@4,reference\:file\:org.apache.lucene_2.9.1.v201101211721.jar@4,reference\:file\:org.apache.lucene.analysis_2.9.1.v201101211721.jar@4,reference\:file\:org.apache.lucene.core_2.9.1.v201101211721.jar@4,reference\:file\:org.eclipse.ant.core_3.2.401.v20121204-162022.jar@4,reference\:file\:org.eclipse.compare_3.5.301.v20130125-135424.jar@4,reference\:file\:org.eclipse.compare.core_3.5.200.v20120522-1148.jar@4,reference\:file\:org.eclipse.core.commands_3.6.2.v20130123-162658.jar@4,reference\:file\:org.eclipse.core.contenttype_3.4.200.v20120523-2004.jar@4,reference\:file\:org.eclipse.core.databinding_1.4.1.v20120912-132807.jar@4,reference\:file\:org.eclipse.core.databinding.beans_1.2.200.v20120523-1955.jar@4,reference\:file\:org.eclipse.core.databinding.observable_1.4.1.v20120521-2329.jar@4,reference\:file\:org.eclipse.core.databinding.property_1.4.100.v20120523-1955.jar@4,reference\:file\:org.eclipse.core.expressions_3.4.401.v20120912-155018.jar@4,reference\:file\:org.eclipse.core.externaltools_1.0.100.v20120521-2012.jar@4,reference\:file\:org.eclipse.core.filebuffers_3.5.200.v20120523-1310.jar@4,reference\:file\:org.eclipse.core.filesystem_1.3.200.v20130115-145044.jar@4,reference\:file\:org.eclipse.core.filesystem.macosx_1.3.0.v20120522-1137.jar@4,reference\:file\:org.eclipse.core.jobs_3.5.300.v20120912-155018.jar@4,reference\:file\:org.eclipse.core.net_1.2.200.v20120914-093638.jar@4,reference\:file\:org.eclipse.core.resources_3.8.1.v20121114-124432.jar@4,reference\:file\:org.eclipse.core.runtime_3.8.0.v20120912-155025.jar@2\:start,reference\:file\:org.eclipse.core.runtime.compatibility_3.2.200.v20120521-2346.jar@4,reference\:file\:org.eclipse.core.runtime.compatibility.registry_3.5.101.v20130108-163257/@4,reference\:file\:org.eclipse.core.variables_3.2.600.v20120521-2012.jar@4,reference\:file\:org.eclipse.debug.core_3.7.100.v20120521-2012.jar@4,reference\:file\:org.eclipse.debug.ui_3.8.2.v20130130-171415.jar@4,reference\:file\:org.eclipse.e4.core.commands_0.10.1.v20120523-1955.jar@4,reference\:file\:org.eclipse.e4.core.contexts_1.2.0.v20121221-192508.jar@4,reference\:file\:org.eclipse.e4.core.di_1.2.0.v20121024-173149.jar@4,reference\:file\:org.eclipse.e4.core.di.extensions_0.11.100.v20121024-182359.jar@4,reference\:file\:org.eclipse.e4.core.services_1.0.0.v20120521-2346.jar@4,reference\:file\:org.eclipse.e4.ui.bindings_0.10.3.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.css.core_0.10.2.v20120912-132817.jar@4,reference\:file\:org.eclipse.e4.ui.css.swt_0.10.3.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.css.swt.theme_0.9.4.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.di_0.10.1.v20120523-1955.jar@4,reference\:file\:org.eclipse.e4.ui.model.workbench_0.10.1.v20120523-1955.jar@4,reference\:file\:org.eclipse.e4.ui.services_0.10.3.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.widgets_0.12.3.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.workbench_0.11.0.v20130125-100758.jar@4,reference\:file\:org.eclipse.e4.ui.workbench.addons.swt_0.10.3.v20130124-185622.jar@4,reference\:file\:org.eclipse.e4.ui.workbench.renderers.swt_0.10.3.v20130124-170312.jar@4,reference\:file\:org.eclipse.e4.ui.workbench.renderers.swt.cocoa_0.11.2.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.workbench.swt_0.10.3.v20130124-133900.jar@4,reference\:file\:org.eclipse.e4.ui.workbench3_0.12.0.v20120521-2329.jar@4,reference\:file\:org.eclipse.ecf_3.1.300.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.filetransfer_5.0.0.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.identity_3.1.200.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.provider.filetransfer_3.2.0.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.provider.filetransfer.httpclient_4.0.200.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.ssl_1.0.100.v20120610-1946.jar@4,reference\:file\:org.eclipse.emf.common_2.8.0.v20130125-0546.jar@4,reference\:file\:org.eclipse.emf.ecore_2.8.3.v20130125-0546.jar@4,reference\:file\:org.eclipse.emf.ecore.change_2.8.0.v20130125-0546.jar@4,reference\:file\:org.eclipse.emf.ecore.xmi_2.8.1.v20130125-0546.jar@4,reference\:file\:org.eclipse.equinox.app_1.3.100.v20120522-1841.jar@4,reference\:file\:org.eclipse.equinox.bidi_0.9.100.v20121107-021609.jar@4,reference\:file\:org.eclipse.equinox.common_3.6.100.v20120522-1841.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.0.0.v20120522-1841.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.1.v20120926-201320.jar@2\:start,reference\:file\:org.eclipse.equinox.event_1.2.200.v20120522-2049.jar@4,reference\:file\:org.eclipse.equinox.frameworkadmin_2.0.100.v20120913-155515.jar@4,reference\:file\:org.eclipse.equinox.frameworkadmin.equinox_1.0.400.v20120913-155709.jar@4,reference\:file\:org.eclipse.equinox.http.jetty_3.0.1.v20121109-203239.jar@4,reference\:file\:org.eclipse.equinox.http.registry_1.1.200.v20120912-130548.jar@4,reference\:file\:org.eclipse.equinox.http.servlet_1.1.300.v20120912-130548.jar@4,reference\:file\:org.eclipse.equinox.jsp.jasper_1.0.400.v20120912-130548.jar@4,reference\:file\:org.eclipse.equinox.jsp.jasper.registry_1.0.300.v20120912-130548.jar@4,reference\:file\:org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar@4,reference\:file\:org.eclipse.equinox.launcher.cocoa.macosx.x86_64_1.1.200.v20120913-144807/@4,reference\:file\:org.eclipse.equinox.p2.artifact.repository_1.1.200.v20120430-1959.jar@4,reference\:file\:org.eclipse.equinox.p2.console_1.0.300.v20120429-0125.jar@4,reference\:file\:org.eclipse.equinox.p2.core_2.2.0.v20120430-0525.jar@4,reference\:file\:org.eclipse.equinox.p2.director_2.2.0.v20120524-0542.jar@4,reference\:file\:org.eclipse.equinox.p2.director.app_1.0.300.v20120428-0517.jar@4,reference\:file\:org.eclipse.equinox.p2.directorywatcher_1.0.300.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.engine_2.2.0.v20130121-021919.jar@4,reference\:file\:org.eclipse.equinox.p2.extensionlocation_1.2.100.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.metadata_2.1.0.v20120430-2001.jar@4,reference\:file\:org.eclipse.equinox.p2.metadata.repository_1.2.100.v20120524-1717.jar@4,reference\:file\:org.eclipse.equinox.p2.operations_2.2.0.v20130119-010614.jar@4,reference\:file\:org.eclipse.equinox.p2.publisher_1.2.0.v20121002-080415.jar@4,reference\:file\:org.eclipse.equinox.p2.publisher.eclipse_1.1.0.v20120913-155635.jar@4,reference\:file\:org.eclipse.equinox.p2.ql_2.0.100.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.reconciler.dropins_1.1.200.v20120301-2145.jar@4,reference\:file\:org.eclipse.equinox.p2.repository_2.2.0.v20120524-1945.jar@4,reference\:file\:org.eclipse.equinox.p2.repository.tools_2.0.100.v20120501-1314.jar@4,reference\:file\:org.eclipse.equinox.p2.touchpoint.eclipse_2.1.100.v20120428-0117.jar@4,reference\:file\:org.eclipse.equinox.p2.touchpoint.natives_1.1.0.v20130121-021919.jar@4,reference\:file\:org.eclipse.equinox.p2.transport.ecf_1.0.100.v20120913-155635.jar@4,reference\:file\:org.eclipse.equinox.p2.ui_2.2.0.v20130119-010614.jar@4,reference\:file\:org.eclipse.equinox.p2.ui.importexport_1.0.1.v20120913-155635.jar@4,reference\:file\:org.eclipse.equinox.p2.ui.sdk_1.0.200.v20120515-1650.jar@4,reference\:file\:org.eclipse.equinox.p2.ui.sdk.scheduler_1.1.0.v20110815-1744.jar@4,reference\:file\:org.eclipse.equinox.p2.updatechecker_1.1.200.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.updatesite_1.0.400.v20120412-1615.jar@4,reference\:file\:org.eclipse.equinox.preferences_3.5.1.v20121031-182809.jar@4,reference\:file\:org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar@4,reference\:file\:org.eclipse.equinox.security_1.1.100.v20120522-1841.jar@4,reference\:file\:org.eclipse.equinox.security.macosx_1.100.200.v20120522-2049.jar@4,reference\:file\:org.eclipse.equinox.security.ui_1.1.100.v20120522-2049.jar@4,reference\:file\:org.eclipse.equinox.simpleconfigurator_1.0.301.v20120914-163612.jar@4,reference\:file\:org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.400.v20120917-192807.jar@4,reference\:file\:org.eclipse.help_3.6.0.v20120912-134126.jar@4,reference\:file\:org.eclipse.help.base_3.6.101.v201302041200.jar@4,reference\:file\:org.eclipse.help.ui_3.5.201.v20130108-092756.jar@4,reference\:file\:org.eclipse.help.webapp_3.6.101.v20130116-182509.jar@4,reference\:file\:org.eclipse.jetty.continuation_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.http_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.io_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.security_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.server_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.servlet_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.util_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jface_3.8.102.v20130123-162658.jar@4,reference\:file\:org.eclipse.jface.databinding_1.6.0.v20120912-132807.jar@4,reference\:file\:org.eclipse.jface.text_3.8.2.v20121126-164145.jar@4,reference\:file\:org.eclipse.jsch.core_1.1.400.v20120522-1148.jar@4,reference\:file\:org.eclipse.jsch.ui_1.1.400.v20120522-1148.jar@4,reference\:file\:org.eclipse.ltk.core.refactoring_3.6.0.v20120523-1543.jar@4,reference\:file\:org.eclipse.ltk.ui.refactoring_3.7.0.v20120523-1543.jar@4,reference\:file\:org.eclipse.osgi.services_3.3.100.v20120522-1822.jar@4,reference\:file\:org.eclipse.osgi.util_3.2.300.v20120913-144807.jar@4,reference\:file\:org.eclipse.platform_4.2.2.v201302041200/@4,reference\:file\:org.eclipse.platform.doc.user_4.2.2.v20130121-200410.jar@4,reference\:file\:org.eclipse.rcp_4.2.1.v201302041200.jar@4,reference\:file\:org.eclipse.search_3.8.0.v20120523-1540.jar@4,reference\:file\:org.eclipse.swt_3.100.1.v4236b.jar@4,reference\:file\:org.eclipse.swt.cocoa.macosx.x86_64_3.100.1.v4236b.jar@4,reference\:file\:org.eclipse.team.core_3.6.100.v20120524-0627.jar@4,reference\:file\:org.eclipse.team.ui_3.6.201.v20130125-135424.jar@4,reference\:file\:org.eclipse.text_3.5.200.v20120523-1310.jar@4,reference\:file\:org.eclipse.ui_3.104.0.v20121024-145224.jar@4,reference\:file\:org.eclipse.ui.browser_3.4.2.v20130123-162658.jar@4,reference\:file\:org.eclipse.ui.cheatsheets_3.4.200.v20120521-2344.jar@4,reference\:file\:org.eclipse.ui.console_3.5.100.v20120521-2012.jar@4,reference\:file\:org.eclipse.ui.editors_3.8.0.v20120523-1540.jar@4,reference\:file\:org.eclipse.ui.externaltools_3.2.100.v20120530-1753.jar@4,reference\:file\:org.eclipse.ui.forms_3.5.200.v20120705-114351.jar@4,reference\:file\:org.eclipse.ui.ide_3.8.2.v20121106-165923.jar@4,reference\:file\:org.eclipse.ui.ide.application_1.0.400.v20120523-1955.jar@4,reference\:file\:org.eclipse.ui.intro_3.4.200.v20120521-2344.jar@4,reference\:file\:org.eclipse.ui.intro.universal_3.2.600.v20120912-155524/@4,reference\:file\:org.eclipse.ui.navigator_3.5.200.v20120705-114103.jar@4,reference\:file\:org.eclipse.ui.navigator.resources_3.4.400.v20120705-114010.jar@4,reference\:file\:org.eclipse.ui.net_1.2.101.v20120914-093638.jar@4,reference\:file\:org.eclipse.ui.views_3.6.100.v20120705-114010.jar@4,reference\:file\:org.eclipse.ui.views.properties.tabbed_3.5.300.v20120912-132807.jar@4,reference\:file\:org.eclipse.ui.workbench_3.104.0.v20130204-164612.jar@4,reference\:file\:org.eclipse.ui.workbench.texteditor_3.8.0.v20120523-1310.jar@4,reference\:file\:org.eclipse.update.configurator_3.3.200.v20120912-144026.jar@4,reference\:file\:org.sat4j.core_2.3.0.v20110329.jar@4,reference\:file\:org.sat4j.pb_2.3.0.v20110329.jar@4,reference\:file\:org.w3c.css.sac_1.3.1.v200903091627.jar@4,reference\:file\:org.w3c.dom.smil_1.0.0.v200806040011.jar@4,reference\:file\:org.w3c.dom.svg_1.1.0.v201011041433.jar@4 +osgi.bundles=reference\:file\:com.android.ide.eclipse.base_25.2.2.3841705.jar@4,reference\:file\:com.android.ide.eclipse.ddms_25.2.2.3841705.jar@4,reference\:file\:com.android.ide.eclipse.gldebugger_25.2.2.3841705.jar@4,reference\:file\:com.android.ide.eclipse.monitor_25.2.2.3841705.jar@4,reference\:file\:com.android.ide.eclipse.traceview_25.2.2.3841705.jar@4,reference\:file\:com.ibm.icu_4.4.2.v20110823.jar@4,reference\:file\:com.jcraft.jsch_0.1.46.v201205102330.jar@4,reference\:file\:com.sun.el_2.2.0.v201108011116.jar@4,reference\:file\:javax.annotation_1.0.0.v20101115-0725.jar@4,reference\:file\:javax.el_2.2.0.v201108011116.jar@4,reference\:file\:javax.inject_1.0.0.v20091030.jar@4,reference\:file\:javax.servlet_3.0.0.v201112011016.jar@4,reference\:file\:javax.servlet.jsp_2.2.0.v201112011158.jar@4,reference\:file\:javax.xml_1.3.4.v201005080400.jar@4,reference\:file\:org.apache.ant_1.8.3.v201301120609/@4,reference\:file\:org.apache.batik.css_1.6.0.v201011041432.jar@4,reference\:file\:org.apache.batik.util_1.6.0.v201011041432.jar@4,reference\:file\:org.apache.batik.util.gui_1.6.0.v201011041432.jar@4,reference\:file\:org.apache.commons.codec_1.3.0.v201101211617.jar@4,reference\:file\:org.apache.commons.httpclient_3.1.0.v201012070820.jar@4,reference\:file\:org.apache.commons.logging_1.0.4.v201101211617.jar@4,reference\:file\:org.apache.felix.gogo.command_0.8.0.v201108120515.jar@4,reference\:file\:org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar@4,reference\:file\:org.apache.felix.gogo.shell_0.8.0.v201110170705.jar@4,reference\:file\:org.apache.jasper.glassfish_2.2.2.v201205150955.jar@4,reference\:file\:org.apache.lucene_2.9.1.v201101211721.jar@4,reference\:file\:org.apache.lucene.analysis_2.9.1.v201101211721.jar@4,reference\:file\:org.apache.lucene.core_2.9.1.v201101211721.jar@4,reference\:file\:org.eclipse.ant.core_3.2.401.v20121204-162022.jar@4,reference\:file\:org.eclipse.compare_3.5.301.v20130125-135424.jar@4,reference\:file\:org.eclipse.compare.core_3.5.200.v20120522-1148.jar@4,reference\:file\:org.eclipse.core.commands_3.6.2.v20130123-162658.jar@4,reference\:file\:org.eclipse.core.contenttype_3.4.200.v20120523-2004.jar@4,reference\:file\:org.eclipse.core.databinding_1.4.1.v20120912-132807.jar@4,reference\:file\:org.eclipse.core.databinding.beans_1.2.200.v20120523-1955.jar@4,reference\:file\:org.eclipse.core.databinding.observable_1.4.1.v20120521-2329.jar@4,reference\:file\:org.eclipse.core.databinding.property_1.4.100.v20120523-1955.jar@4,reference\:file\:org.eclipse.core.expressions_3.4.401.v20120912-155018.jar@4,reference\:file\:org.eclipse.core.externaltools_1.0.100.v20120521-2012.jar@4,reference\:file\:org.eclipse.core.filebuffers_3.5.200.v20120523-1310.jar@4,reference\:file\:org.eclipse.core.filesystem_1.3.200.v20130115-145044.jar@4,reference\:file\:org.eclipse.core.filesystem.macosx_1.3.0.v20120522-1137.jar@4,reference\:file\:org.eclipse.core.jobs_3.5.300.v20120912-155018.jar@4,reference\:file\:org.eclipse.core.net_1.2.200.v20120914-093638.jar@4,reference\:file\:org.eclipse.core.resources_3.8.1.v20121114-124432.jar@4,reference\:file\:org.eclipse.core.runtime_3.8.0.v20120912-155025.jar@2\:start,reference\:file\:org.eclipse.core.runtime.compatibility_3.2.200.v20120521-2346.jar@4,reference\:file\:org.eclipse.core.runtime.compatibility.registry_3.5.101.v20130108-163257/@4,reference\:file\:org.eclipse.core.variables_3.2.600.v20120521-2012.jar@4,reference\:file\:org.eclipse.debug.core_3.7.100.v20120521-2012.jar@4,reference\:file\:org.eclipse.debug.ui_3.8.2.v20130130-171415.jar@4,reference\:file\:org.eclipse.e4.core.commands_0.10.1.v20120523-1955.jar@4,reference\:file\:org.eclipse.e4.core.contexts_1.2.0.v20121221-192508.jar@4,reference\:file\:org.eclipse.e4.core.di_1.2.0.v20121024-173149.jar@4,reference\:file\:org.eclipse.e4.core.di.extensions_0.11.100.v20121024-182359.jar@4,reference\:file\:org.eclipse.e4.core.services_1.0.0.v20120521-2346.jar@4,reference\:file\:org.eclipse.e4.ui.bindings_0.10.3.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.css.core_0.10.2.v20120912-132817.jar@4,reference\:file\:org.eclipse.e4.ui.css.swt_0.10.3.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.css.swt.theme_0.9.4.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.di_0.10.1.v20120523-1955.jar@4,reference\:file\:org.eclipse.e4.ui.model.workbench_0.10.1.v20120523-1955.jar@4,reference\:file\:org.eclipse.e4.ui.services_0.10.3.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.widgets_0.12.3.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.workbench_0.11.0.v20130125-100758.jar@4,reference\:file\:org.eclipse.e4.ui.workbench.addons.swt_0.10.3.v20130124-185622.jar@4,reference\:file\:org.eclipse.e4.ui.workbench.renderers.swt_0.10.3.v20130124-170312.jar@4,reference\:file\:org.eclipse.e4.ui.workbench.renderers.swt.cocoa_0.11.2.v20130123-162658.jar@4,reference\:file\:org.eclipse.e4.ui.workbench.swt_0.10.3.v20130124-133900.jar@4,reference\:file\:org.eclipse.e4.ui.workbench3_0.12.0.v20120521-2329.jar@4,reference\:file\:org.eclipse.ecf_3.1.300.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.filetransfer_5.0.0.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.identity_3.1.200.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.provider.filetransfer_3.2.0.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.provider.filetransfer.httpclient_4.0.200.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20120610-1946.jar@4,reference\:file\:org.eclipse.ecf.ssl_1.0.100.v20120610-1946.jar@4,reference\:file\:org.eclipse.emf.common_2.8.0.v20130125-0546.jar@4,reference\:file\:org.eclipse.emf.ecore_2.8.3.v20130125-0546.jar@4,reference\:file\:org.eclipse.emf.ecore.change_2.8.0.v20130125-0546.jar@4,reference\:file\:org.eclipse.emf.ecore.xmi_2.8.1.v20130125-0546.jar@4,reference\:file\:org.eclipse.equinox.app_1.3.100.v20120522-1841.jar@4,reference\:file\:org.eclipse.equinox.bidi_0.9.100.v20121107-021609.jar@4,reference\:file\:org.eclipse.equinox.common_3.6.100.v20120522-1841.jar@2\:start,reference\:file\:org.eclipse.equinox.console_1.0.0.v20120522-1841.jar@4,reference\:file\:org.eclipse.equinox.ds_1.4.1.v20120926-201320.jar@2\:start,reference\:file\:org.eclipse.equinox.event_1.2.200.v20120522-2049.jar@4,reference\:file\:org.eclipse.equinox.frameworkadmin_2.0.100.v20120913-155515.jar@4,reference\:file\:org.eclipse.equinox.frameworkadmin.equinox_1.0.400.v20120913-155709.jar@4,reference\:file\:org.eclipse.equinox.http.jetty_3.0.1.v20121109-203239.jar@4,reference\:file\:org.eclipse.equinox.http.registry_1.1.200.v20120912-130548.jar@4,reference\:file\:org.eclipse.equinox.http.servlet_1.1.300.v20120912-130548.jar@4,reference\:file\:org.eclipse.equinox.jsp.jasper_1.0.400.v20120912-130548.jar@4,reference\:file\:org.eclipse.equinox.jsp.jasper.registry_1.0.300.v20120912-130548.jar@4,reference\:file\:org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar@4,reference\:file\:org.eclipse.equinox.launcher.cocoa.macosx.x86_64_1.1.200.v20120913-144807/@4,reference\:file\:org.eclipse.equinox.p2.artifact.repository_1.1.200.v20120430-1959.jar@4,reference\:file\:org.eclipse.equinox.p2.console_1.0.300.v20120429-0125.jar@4,reference\:file\:org.eclipse.equinox.p2.core_2.2.0.v20120430-0525.jar@4,reference\:file\:org.eclipse.equinox.p2.director_2.2.0.v20120524-0542.jar@4,reference\:file\:org.eclipse.equinox.p2.director.app_1.0.300.v20120428-0517.jar@4,reference\:file\:org.eclipse.equinox.p2.directorywatcher_1.0.300.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.engine_2.2.0.v20130121-021919.jar@4,reference\:file\:org.eclipse.equinox.p2.extensionlocation_1.2.100.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.metadata_2.1.0.v20120430-2001.jar@4,reference\:file\:org.eclipse.equinox.p2.metadata.repository_1.2.100.v20120524-1717.jar@4,reference\:file\:org.eclipse.equinox.p2.operations_2.2.0.v20130119-010614.jar@4,reference\:file\:org.eclipse.equinox.p2.publisher_1.2.0.v20121002-080415.jar@4,reference\:file\:org.eclipse.equinox.p2.publisher.eclipse_1.1.0.v20120913-155635.jar@4,reference\:file\:org.eclipse.equinox.p2.ql_2.0.100.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.reconciler.dropins_1.1.200.v20120301-2145.jar@4,reference\:file\:org.eclipse.equinox.p2.repository_2.2.0.v20120524-1945.jar@4,reference\:file\:org.eclipse.equinox.p2.repository.tools_2.0.100.v20120501-1314.jar@4,reference\:file\:org.eclipse.equinox.p2.touchpoint.eclipse_2.1.100.v20120428-0117.jar@4,reference\:file\:org.eclipse.equinox.p2.touchpoint.natives_1.1.0.v20130121-021919.jar@4,reference\:file\:org.eclipse.equinox.p2.transport.ecf_1.0.100.v20120913-155635.jar@4,reference\:file\:org.eclipse.equinox.p2.ui_2.2.0.v20130119-010614.jar@4,reference\:file\:org.eclipse.equinox.p2.ui.importexport_1.0.1.v20120913-155635.jar@4,reference\:file\:org.eclipse.equinox.p2.ui.sdk_1.0.200.v20120515-1650.jar@4,reference\:file\:org.eclipse.equinox.p2.ui.sdk.scheduler_1.1.0.v20110815-1744.jar@4,reference\:file\:org.eclipse.equinox.p2.updatechecker_1.1.200.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.p2.updatesite_1.0.400.v20120412-1615.jar@4,reference\:file\:org.eclipse.equinox.preferences_3.5.1.v20121031-182809.jar@4,reference\:file\:org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar@4,reference\:file\:org.eclipse.equinox.security_1.1.100.v20120522-1841.jar@4,reference\:file\:org.eclipse.equinox.security.macosx_1.100.200.v20120522-2049.jar@4,reference\:file\:org.eclipse.equinox.security.ui_1.1.100.v20120522-2049.jar@4,reference\:file\:org.eclipse.equinox.simpleconfigurator_1.0.301.v20120914-163612.jar@4,reference\:file\:org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110808-1657.jar@4,reference\:file\:org.eclipse.equinox.util_1.0.400.v20120917-192807.jar@4,reference\:file\:org.eclipse.help_3.6.0.v20120912-134126.jar@4,reference\:file\:org.eclipse.help.base_3.6.101.v201302041200.jar@4,reference\:file\:org.eclipse.help.ui_3.5.201.v20130108-092756.jar@4,reference\:file\:org.eclipse.help.webapp_3.6.101.v20130116-182509.jar@4,reference\:file\:org.eclipse.jetty.continuation_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.http_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.io_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.security_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.server_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.servlet_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jetty.util_8.1.3.v20120522.jar@4,reference\:file\:org.eclipse.jface_3.8.102.v20130123-162658.jar@4,reference\:file\:org.eclipse.jface.databinding_1.6.0.v20120912-132807.jar@4,reference\:file\:org.eclipse.jface.text_3.8.2.v20121126-164145.jar@4,reference\:file\:org.eclipse.jsch.core_1.1.400.v20120522-1148.jar@4,reference\:file\:org.eclipse.jsch.ui_1.1.400.v20120522-1148.jar@4,reference\:file\:org.eclipse.ltk.core.refactoring_3.6.0.v20120523-1543.jar@4,reference\:file\:org.eclipse.ltk.ui.refactoring_3.7.0.v20120523-1543.jar@4,reference\:file\:org.eclipse.osgi.services_3.3.100.v20120522-1822.jar@4,reference\:file\:org.eclipse.osgi.util_3.2.300.v20120913-144807.jar@4,reference\:file\:org.eclipse.platform_4.2.2.v201302041200/@4,reference\:file\:org.eclipse.platform.doc.user_4.2.2.v20130121-200410.jar@4,reference\:file\:org.eclipse.rcp_4.2.1.v201302041200.jar@4,reference\:file\:org.eclipse.search_3.8.0.v20120523-1540.jar@4,reference\:file\:org.eclipse.swt_3.100.1.v4236b.jar@4,reference\:file\:org.eclipse.swt.cocoa.macosx.x86_64_3.100.1.v4236b.jar@4,reference\:file\:org.eclipse.team.core_3.6.100.v20120524-0627.jar@4,reference\:file\:org.eclipse.team.ui_3.6.201.v20130125-135424.jar@4,reference\:file\:org.eclipse.text_3.5.200.v20120523-1310.jar@4,reference\:file\:org.eclipse.ui_3.104.0.v20121024-145224.jar@4,reference\:file\:org.eclipse.ui.browser_3.4.2.v20130123-162658.jar@4,reference\:file\:org.eclipse.ui.cheatsheets_3.4.200.v20120521-2344.jar@4,reference\:file\:org.eclipse.ui.console_3.5.100.v20120521-2012.jar@4,reference\:file\:org.eclipse.ui.editors_3.8.0.v20120523-1540.jar@4,reference\:file\:org.eclipse.ui.externaltools_3.2.100.v20120530-1753.jar@4,reference\:file\:org.eclipse.ui.forms_3.5.200.v20120705-114351.jar@4,reference\:file\:org.eclipse.ui.ide_3.8.2.v20121106-165923.jar@4,reference\:file\:org.eclipse.ui.ide.application_1.0.400.v20120523-1955.jar@4,reference\:file\:org.eclipse.ui.intro_3.4.200.v20120521-2344.jar@4,reference\:file\:org.eclipse.ui.intro.universal_3.2.600.v20120912-155524/@4,reference\:file\:org.eclipse.ui.navigator_3.5.200.v20120705-114103.jar@4,reference\:file\:org.eclipse.ui.navigator.resources_3.4.400.v20120705-114010.jar@4,reference\:file\:org.eclipse.ui.net_1.2.101.v20120914-093638.jar@4,reference\:file\:org.eclipse.ui.views_3.6.100.v20120705-114010.jar@4,reference\:file\:org.eclipse.ui.views.properties.tabbed_3.5.300.v20120912-132807.jar@4,reference\:file\:org.eclipse.ui.workbench_3.104.0.v20130204-164612.jar@4,reference\:file\:org.eclipse.ui.workbench.texteditor_3.8.0.v20120523-1310.jar@4,reference\:file\:org.eclipse.update.configurator_3.3.200.v20120912-144026.jar@4,reference\:file\:org.sat4j.core_2.3.0.v20110329.jar@4,reference\:file\:org.sat4j.pb_2.3.0.v20110329.jar@4,reference\:file\:org.w3c.css.sac_1.3.1.v200903091627.jar@4,reference\:file\:org.w3c.dom.smil_1.0.0.v200806040011.jar@4,reference\:file\:org.w3c.dom.svg_1.1.0.v201011041433.jar@4 eclipse.product=com.android.ide.eclipse.monitor.product osgi.splashPath=platform\:/base/plugins/com.android.ide.eclipse.monitor osgi.framework.extensions= diff --git a/lib/monitor-x86_64/configuration/org.eclipse.update/platform.xml b/lib/monitor-x86_64/configuration/org.eclipse.update/platform.xml index 473c16c..9666a7d 100644 --- a/lib/monitor-x86_64/configuration/org.eclipse.update/platform.xml +++ b/lib/monitor-x86_64/configuration/org.eclipse.update/platform.xml @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<config date="1488317073876" transient="false"> +<config date="1490229658583" transient="false"> <site updateable="true" url="platform:/base/" enabled="true" policy="USER-EXCLUDE"> - <feature id="com.android.ide.eclipse.gldebugger.feature" version="25.2.2.3773319" url="features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3773319/"> - </feature> <feature id="org.eclipse.equinox.p2.extras.feature" version="1.1.0.v20121211-153934-7A6FEcDiVOTg2RYDuZuFz-L2z00w" url="features/org.eclipse.equinox.p2.extras.feature_1.1.0.v20121211-153934-7A6FEcDiVOTg2RYDuZuFz-L2z00w/"> </feature> - <feature id="org.eclipse.help" version="1.4.1.v20120912-144938-8R7xFOXFLWUl7PpNBh_HIGkb4" url="features/org.eclipse.help_1.4.1.v20120912-144938-8R7xFOXFLWUl7PpNBh_HIGkb4/" plugin-identifier="org.eclipse.help.base"> + <feature id="com.android.ide.eclipse.monitor.feature" version="25.2.2.3841705" url="features/com.android.ide.eclipse.monitor.feature_25.2.2.3841705/" plugin-identifier="com.android.ide.eclipse.monitor"> </feature> - <feature id="com.android.ide.eclipse.traceview.feature" version="25.2.2.3773319" url="features/com.android.ide.eclipse.traceview.feature_25.2.2.3773319/" plugin-identifier="com.android.ide.eclipse.traceview"> + <feature id="org.eclipse.help" version="1.4.1.v20120912-144938-8R7xFOXFLWUl7PpNBh_HIGkb4" url="features/org.eclipse.help_1.4.1.v20120912-144938-8R7xFOXFLWUl7PpNBh_HIGkb4/" plugin-identifier="org.eclipse.help.base"> </feature> <feature id="org.eclipse.equinox.p2.user.ui" version="2.2.0.v20121212-204731-62DG9JXTlTj-UXcQ2y3NLn6U4Z3H" url="features/org.eclipse.equinox.p2.user.ui_2.2.0.v20121212-204731-62DG9JXTlTj-UXcQ2y3NLn6U4Z3H/"> </feature> @@ -17,15 +15,17 @@ </feature> <feature id="org.eclipse.emf.ecore" version="2.8.3.v20130125-0546" url="features/org.eclipse.emf.ecore_2.8.3.v20130125-0546/"> </feature> + <feature id="com.android.ide.eclipse.traceview.feature" version="25.2.2.3841705" url="features/com.android.ide.eclipse.traceview.feature_25.2.2.3841705/" plugin-identifier="com.android.ide.eclipse.traceview"> + </feature> <feature id="org.eclipse.e4.rcp" version="1.1.2.v20130130-191718-91FUvGP7GIX2Kgz-z-gvjMvXV1NS" url="features/org.eclipse.e4.rcp_1.1.2.v20130130-191718-91FUvGP7GIX2Kgz-z-gvjMvXV1NS/"> </feature> <feature id="org.eclipse.emf.common" version="2.8.0.v20130125-0546" url="features/org.eclipse.emf.common_2.8.0.v20130125-0546/"> </feature> <feature id="org.eclipse.rcp" version="4.2.2.v20130129-152330-7IARAABrMQkGSvMgQnUlz-DQz00h" url="features/org.eclipse.rcp_4.2.2.v20130129-152330-7IARAABrMQkGSvMgQnUlz-DQz00h/"> </feature> - <feature id="com.android.ide.eclipse.monitor.feature" version="25.2.2.3773319" url="features/com.android.ide.eclipse.monitor.feature_25.2.2.3773319/" plugin-identifier="com.android.ide.eclipse.monitor"> + <feature id="com.android.ide.eclipse.ddms.feature" version="25.2.2.3841705" url="features/com.android.ide.eclipse.ddms.feature_25.2.2.3841705/" plugin-identifier="com.android.ide.eclipse.ddms"> </feature> - <feature id="com.android.ide.eclipse.ddms.feature" version="25.2.2.3773319" url="features/com.android.ide.eclipse.ddms.feature_25.2.2.3773319/" plugin-identifier="com.android.ide.eclipse.ddms"> + <feature id="com.android.ide.eclipse.gldebugger.feature" version="25.2.2.3841705" url="features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3841705/"> </feature> <feature id="org.eclipse.equinox.p2.rcp.feature" version="1.1.0.v20121211-153934-785EoBqNKNZz-DW7sUc8hFwz00wd" url="features/org.eclipse.equinox.p2.rcp.feature_1.1.0.v20121211-153934-785EoBqNKNZz-DW7sUc8hFwz00wd/"> </feature> diff --git a/lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3773319/META-INF/MANIFEST.MF b/lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3841705/META-INF/MANIFEST.MF index 8f19005..8f19005 100644 --- a/lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3773319/META-INF/MANIFEST.MF +++ b/lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3841705/META-INF/MANIFEST.MF diff --git a/lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3773319/feature.xml b/lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3841705/feature.xml index 6909306..950f885 100644 --- a/lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3773319/feature.xml +++ b/lib/monitor-x86_64/features/com.android.ide.eclipse.ddms.feature_25.2.2.3841705/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.ddms.feature" label="Android DDMS" - version="25.2.2.3773319" + version="25.2.2.3841705" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.ddms"> @@ -238,16 +238,16 @@ <plugin id="com.android.ide.eclipse.base" - download-size="4544" - install-size="5079" - version="25.2.2.3773319" + download-size="4546" + install-size="5082" + version="25.2.2.3841705" unpack="false"/> <plugin id="com.android.ide.eclipse.ddms" download-size="2572" install-size="2915" - version="25.2.2.3773319" + version="25.2.2.3841705" unpack="false"/> </feature> diff --git a/lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3773319/META-INF/MANIFEST.MF b/lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3841705/META-INF/MANIFEST.MF index 8f19005..8f19005 100644 --- a/lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3773319/META-INF/MANIFEST.MF +++ b/lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3841705/META-INF/MANIFEST.MF diff --git a/lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3773319/feature.xml b/lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3841705/feature.xml index c42b099..d93b710 100644 --- a/lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3773319/feature.xml +++ b/lib/monitor-x86_64/features/com.android.ide.eclipse.gldebugger.feature_25.2.2.3841705/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.gldebugger.feature" label="Tracer for OpenGL ES" - version="25.2.2.3773319" + version="25.2.2.3841705" provider-name="The Android Open Source Project"> <description> @@ -226,7 +226,7 @@ id="com.android.ide.eclipse.gldebugger" download-size="508" install-size="1077" - version="25.2.2.3773319" + version="25.2.2.3841705" unpack="false"/> </feature> diff --git a/lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3773319/META-INF/MANIFEST.MF b/lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3841705/META-INF/MANIFEST.MF index 8f19005..8f19005 100644 --- a/lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3773319/META-INF/MANIFEST.MF +++ b/lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3841705/META-INF/MANIFEST.MF diff --git a/lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3773319/feature.xml b/lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3841705/feature.xml index 3c3dfc5..2f812b0 100644 --- a/lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3773319/feature.xml +++ b/lib/monitor-x86_64/features/com.android.ide.eclipse.monitor.feature_25.2.2.3841705/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.monitor.feature" label="Android Monitor" - version="25.2.2.3773319" + version="25.2.2.3841705" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.monitor"> @@ -227,7 +227,7 @@ id="com.android.ide.eclipse.monitor" download-size="212" install-size="284" - version="25.2.2.3773319" + version="25.2.2.3841705" unpack="false"/> </feature> diff --git a/lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3773319/META-INF/MANIFEST.MF b/lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3841705/META-INF/MANIFEST.MF index 8f19005..8f19005 100644 --- a/lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3773319/META-INF/MANIFEST.MF +++ b/lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3841705/META-INF/MANIFEST.MF diff --git a/lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3773319/feature.xml b/lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3841705/feature.xml index 25da7b2..f556349 100644 --- a/lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3773319/feature.xml +++ b/lib/monitor-x86_64/features/com.android.ide.eclipse.traceview.feature_25.2.2.3841705/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.traceview.feature" label="Android Traceview" - version="25.2.2.3773319" + version="25.2.2.3841705" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.traceview"> @@ -233,7 +233,7 @@ id="com.android.ide.eclipse.traceview" download-size="137" install-size="154" - version="25.2.2.3773319" + version="25.2.2.3841705" unpack="false"/> </feature> diff --git a/lib/monitor-x86_64/monitor.app/Contents/Info.plist b/lib/monitor-x86_64/monitor.app/Contents/Info.plist index 466d651..bdf2f85 100644 --- a/lib/monitor-x86_64/monitor.app/Contents/Info.plist +++ b/lib/monitor-x86_64/monitor.app/Contents/Info.plist @@ -22,7 +22,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>25.2.2.3773319</string> + <string>25.2.2.3841705</string> <key>NSHighResolutionCapable</key> <true/> <key>CFBundleDevelopmentRegion</key> diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/artifacts.xml b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/artifacts.xml index e067a39..822ed17 100644 --- a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/artifacts.xml +++ b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/artifacts.xml @@ -3,7 +3,7 @@ <repository name='download cache' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'> <properties size='2'> <property name='p2.system' value='true'/> - <property name='p2.timestamp' value='1488317073211'/> + <property name='p2.timestamp' value='1490229657913'/> </properties> <mappings size='3'> <rule filter='(& (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/> @@ -11,9 +11,9 @@ <rule filter='(& (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/> </mappings> <artifacts size='3'> - <artifact classifier='binary' id='monitorproduct.executable.cocoa.macosx.x86_64' version='25.2.2.3773319'> + <artifact classifier='binary' id='monitorproduct.executable.cocoa.macosx.x86_64' version='25.2.2.3841705'> <properties size='1'> - <property name='download.size' value='11069'/> + <property name='download.size' value='11072'/> </properties> </artifact> <artifact classifier='binary' id='org.eclipse.rcp_root' version='4.2.2.v20130129-152330-7IARAABrMQkGSvMgQnUlz-DQz00h'> diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/binary/monitorproduct.executable.cocoa.macosx.x86_64_25.2.2.3773319 b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/binary/monitorproduct.executable.cocoa.macosx.x86_64_25.2.2.3841705 Binary files differindex a84c7f6..8ad9259 100644 --- a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/binary/monitorproduct.executable.cocoa.macosx.x86_64_25.2.2.3773319 +++ b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.core/cache/binary/monitorproduct.executable.cocoa.macosx.x86_64_25.2.2.3841705 diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/.data/org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions/jvmargs b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/.data/org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions/jvmargs index 7590bf2..236bbab 100644 --- a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/.data/org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions/jvmargs +++ b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/.data/org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions/jvmargs @@ -1,4 +1,4 @@ -#Tue Feb 28 13:24:33 PST 2017 +#Wed Mar 22 17:40:58 PDT 2017 -Xms=512m -XX\:MaxPermSize\==256m -Xmx=1024m diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317072642.profile.gz b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317072642.profile.gz Binary files differdeleted file mode 100644 index 173395b..0000000 --- a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317072642.profile.gz +++ /dev/null diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317072644.profile.gz b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317072644.profile.gz Binary files differdeleted file mode 100644 index b583c43..0000000 --- a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317072644.profile.gz +++ /dev/null diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229657321.profile.gz b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229657321.profile.gz Binary files differnew file mode 100644 index 0000000..14f15d7 --- /dev/null +++ b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229657321.profile.gz diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229657323.profile.gz b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229657323.profile.gz Binary files differnew file mode 100644 index 0000000..a50fe20 --- /dev/null +++ b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229657323.profile.gz diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317073727.profile.gz b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229658433.profile.gz Binary files differindex da1d0d5..75991e3 100644 --- a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317073727.profile.gz +++ b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229658433.profile.gz diff --git a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317073924.profile.gz b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229658632.profile.gz Binary files differindex 234f2b4..6c3df23 100644 --- a/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1488317073924.profile.gz +++ b/lib/monitor-x86_64/p2/org.eclipse.equinox.p2.engine/profileRegistry/DefaultProfile.profile/1490229658632.profile.gz diff --git a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.base_25.2.2.3773319.jar b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.base_25.2.2.3841705.jar Binary files differindex d26b9a5..88d6fc8 100644 --- a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.base_25.2.2.3773319.jar +++ b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.base_25.2.2.3841705.jar diff --git a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.ddms_25.2.2.3773319.jar b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.ddms_25.2.2.3841705.jar Binary files differindex 3497eab..854fe1c 100644 --- a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.ddms_25.2.2.3773319.jar +++ b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.ddms_25.2.2.3841705.jar diff --git a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.gldebugger_25.2.2.3773319.jar b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.gldebugger_25.2.2.3841705.jar Binary files differindex d8b375d..7d6a127 100644 --- a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.gldebugger_25.2.2.3773319.jar +++ b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.gldebugger_25.2.2.3841705.jar diff --git a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.monitor_25.2.2.3773319.jar b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.monitor_25.2.2.3841705.jar Binary files differindex 5baa99f..ae52ca5 100644 --- a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.monitor_25.2.2.3773319.jar +++ b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.monitor_25.2.2.3841705.jar diff --git a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.traceview_25.2.2.3773319.jar b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.traceview_25.2.2.3841705.jar Binary files differindex a5dc6d4..d0d7e89 100644 --- a/lib/monitor-x86_64/plugins/com.android.ide.eclipse.traceview_25.2.2.3773319.jar +++ b/lib/monitor-x86_64/plugins/com.android.ide.eclipse.traceview_25.2.2.3841705.jar diff --git a/lib/monkeyrunner-25.3.0.jar b/lib/monkeyrunner-25.3.1.jar Binary files differindex 8ff37bc..cbe0255 100644 --- a/lib/monkeyrunner-25.3.0.jar +++ b/lib/monkeyrunner-25.3.1.jar diff --git a/lib/repository-25.3.0.jar b/lib/repository-25.3.1.jar Binary files differindex 59ae191..3b8cbbd 100644 --- a/lib/repository-25.3.0.jar +++ b/lib/repository-25.3.1.jar diff --git a/lib/screenshot2-25.3.0.jar b/lib/screenshot2-25.3.1.jar Binary files differindex 56fbbe8..85498a0 100644 --- a/lib/screenshot2-25.3.0.jar +++ b/lib/screenshot2-25.3.1.jar diff --git a/lib/sdk-common-25.3.0.jar b/lib/sdk-common-25.3.1.jar Binary files differindex ec462ad..794d759 100644 --- a/lib/sdk-common-25.3.0.jar +++ b/lib/sdk-common-25.3.1.jar diff --git a/lib/sdklib-25.3.0.jar b/lib/sdklib-25.3.1.jar Binary files differindex d2d3a4e..4ac4359 100644 --- a/lib/sdklib-25.3.0.jar +++ b/lib/sdklib-25.3.1.jar diff --git a/lib/swtmenubar-25.3.0.jar b/lib/swtmenubar-25.3.1.jar Binary files differindex c608221..b7e6ade 100644 --- a/lib/swtmenubar-25.3.0.jar +++ b/lib/swtmenubar-25.3.1.jar diff --git a/lib/traceview-25.3.0.jar b/lib/traceview-25.3.1.jar Binary files differindex 2d84088..f12a8d0 100644 --- a/lib/traceview-25.3.0.jar +++ b/lib/traceview-25.3.1.jar diff --git a/lib/uast-162.2228.14.jar b/lib/uast-162.2228.14.jar Binary files differindex 434ec3d..b84fd0c 100644 --- a/lib/uast-162.2228.14.jar +++ b/lib/uast-162.2228.14.jar diff --git a/lib/uiautomatorviewer-25.3.0.jar b/lib/uiautomatorviewer-25.3.1.jar Binary files differindex 0427abe..32bca7a 100644 --- a/lib/uiautomatorviewer-25.3.0.jar +++ b/lib/uiautomatorviewer-25.3.1.jar diff --git a/package.xml b/package.xml index 4c527d6..b741ce7 100644 --- a/package.xml +++ b/package.xml @@ -138,4 +138,4 @@ This is the Android Software Development Kit License Agreement 14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. -November 20, 2015</license><localPackage path="tools" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns5:genericDetailsType"/><revision><major>25</major><minor>3</minor><micro>1</micro></revision><display-name>Android SDK Tools</display-name><uses-license ref="android-sdk-license"/><dependencies><dependency path="emulator"/><dependency path="platform-tools"><min-revision><major>20</major></min-revision></dependency></dependencies></localPackage></ns2:repository> +November 20, 2015</license><localPackage path="tools" obsolete="false"><type-details xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns5:genericDetailsType"/><revision><major>26</major><minor>0</minor><micro>0</micro></revision><display-name>Android SDK Tools</display-name><uses-license ref="android-sdk-license"/><dependencies><dependency path="emulator"/><dependency path="platform-tools"><min-revision><major>20</major></min-revision></dependency></dependencies></localPackage></ns2:repository> diff --git a/source.properties b/source.properties index 152187b..2ec7c8a 100644 --- a/source.properties +++ b/source.properties @@ -1,6 +1,6 @@ Pkg.UserSrc=false -Pkg.Revision=25.3.1 +Pkg.Revision=26.0.0 Platform.MinPlatformToolsRev=20 Pkg.Dependencies=emulator Pkg.Path=tools diff --git a/support/annotations.jar b/support/annotations.jar Binary files differindex 968ab46..792bc31 100644 --- a/support/annotations.jar +++ b/support/annotations.jar |