diff options
| author | Bo Hu <bohu@google.com> | 2015-10-08 21:47:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-08 21:47:23 +0000 |
| commit | cab2ca2668272c5ea2d9a5c92062619c83a1b200 (patch) | |
| tree | 95ce387cccbd9e2974bf9d4f5f8ad360318a51b8 | |
| parent | 2f64cd32308a6af3263cf80e67eb1e1eb7b77b20 (diff) | |
| parent | 0bb5d956d1eefdd4a0bdb4e87632f2df7869c949 (diff) | |
| download | platform_sdk-studio-1.4-dev.tar.gz platform_sdk-studio-1.4-dev.tar.bz2 platform_sdk-studio-1.4-dev.zip | |
Merge "Update version from 24.4.0 -> 24.4.1" into studio-1.4-devstudio-1.4-dev
50 files changed, 62 insertions, 62 deletions
diff --git a/eclipse/artifacts/bundles/monitor.product b/eclipse/artifacts/bundles/monitor.product index da35110c4..c50484124 100644 --- a/eclipse/artifacts/bundles/monitor.product +++ b/eclipse/artifacts/bundles/monitor.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="monitor" uid="monitorproduct" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="24.4.0.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="monitor" uid="monitorproduct" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="24.4.1.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> diff --git a/eclipse/artifacts/bundles/pom.xml b/eclipse/artifacts/bundles/pom.xml index 73818201c..a7777857b 100644 --- a/eclipse/artifacts/bundles/pom.xml +++ b/eclipse/artifacts/bundles/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>bundles</artifactId> <packaging>eclipse-repository</packaging> <name>bundles</name> diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml index f678cbb61..4265ad2ea 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.adt.package.feature" label="ADT Package" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.adt.package"> diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml index 677719688..ef85a3a22 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.adt.package.feature</artifactId> <packaging>eclipse-feature</packaging> <name>adt.package</name> diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index 59566f4aa..08c9046c0 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.adt.feature" label="Android Development Tools" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.adt"> diff --git a/eclipse/features/com.android.ide.eclipse.adt/pom.xml b/eclipse/features/com.android.ide.eclipse.adt/pom.xml index cf9897507..47bea6d6f 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.adt.feature</artifactId> <packaging>eclipse-feature</packaging> <name>adt</name> diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml index 58272f476..cf0f35e26 100644 --- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.ddms.feature" label="Android DDMS" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.ddms"> diff --git a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml index 5196b02ad..951c6afb4 100644 --- a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.ddms.feature</artifactId> <packaging>eclipse-feature</packaging> <name>ddms</name> diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml index 2fbc17d7b..0295ed895 100644 --- a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.gldebugger.feature" label="Tracer for OpenGL ES" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml index f7c8d1bae..65d187aa8 100644 --- a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.gldebugger.feature</artifactId> <packaging>eclipse-feature</packaging> <name>gldebugger</name> diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml index b5bcbc582..466dfd6c9 100644 --- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.hierarchyviewer.feature" label="Android Hierarchy Viewer" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.hierarchyviewer"> diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml index 41f4a439b..a51a69999 100644 --- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.hierarchyviewer.feature</artifactId> <packaging>eclipse-feature</packaging> <name>hierarchyviewer</name> diff --git a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml index 974d2217f..2ad9311ac 100644 --- a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.monitor.feature" label="Android Monitor" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.monitor"> diff --git a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml index 966163038..1e59219dd 100644 --- a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.monitor.feature</artifactId> <packaging>eclipse-feature</packaging> <name>monitor</name> diff --git a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml index 62ec6fc21..4389d8ce3 100644 --- a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.ndk.feature" label="Android Native Development Tools" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml index 5b505e0b2..09451a2a2 100644 --- a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.ndk.feature</artifactId> <packaging>eclipse-feature</packaging> <name>ndk</name> diff --git a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml index bec2fc950..dc70b2c7e 100644 --- a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.pdt" label="Android Platform Development Tools" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.tests/feature.xml b/eclipse/features/com.android.ide.eclipse.tests/feature.xml index 3dd4c0817..614cb4890 100644 --- a/eclipse/features/com.android.ide.eclipse.tests/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.tests/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.tests" label="ADT Tests" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project"> <copyright> diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml index 213e9ee6b..8915b29be 100644 --- a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.traceview.feature" label="Android Traceview" - version="24.4.0.qualifier" + version="24.4.1.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.traceview"> diff --git a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml index 034c68f43..afa445194 100644 --- a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.traceview.feature</artifactId> <packaging>eclipse-feature</packaging> <name>traceview</name> diff --git a/eclipse/monitor/build.gradle b/eclipse/monitor/build.gradle index 951c90fd5..7453daf5f 100644 --- a/eclipse/monitor/build.gradle +++ b/eclipse/monitor/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'sdk-files' -def basePath = "../../../out/host/maven/bundles-24.4.0-SNAPSHOT/products/" +def basePath = "../../../out/host/maven/bundles-24.4.1-SNAPSHOT/products/" sdk { linux { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF index 26912c5e2..81a534064 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT XML Overlay Bundle-SymbolicName: overlay.com.android.ide.eclipse.adt.overlay;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml index 9ff755f66..4e0855bd7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>overlay.com.android.ide.eclipse.adt.overlay</artifactId> <packaging>eclipse-plugin</packaging> <name>adt.overlay</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF index d49515f87..bd967c747 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT Package Bundle-SymbolicName: com.android.ide.eclipse.adt.package;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Vendor: The Android Open Source Project Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-BundleShape: dir diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml index 49264c8a9..ccd937b05 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.adt.package</artifactId> <packaging>eclipse-plugin</packaging> <name>adt.package</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF index 17da122a5..4b6271776 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Android Development Toolkit Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-ClassPath: ., libs/sdkuilib.jar, libs/ninepatch.jar, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml index 7ec842d63..9ea1802b9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.adt</artifactId> <packaging>eclipse-plugin</packaging> <name>adt</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF index b1a05e109..1f91f3563 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common Android Utilities Bundle-SymbolicName: com.android.ide.eclipse.base;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy diff --git a/eclipse/plugins/com.android.ide.eclipse.base/pom.xml b/eclipse/plugins/com.android.ide.eclipse.base/pom.xml index fddac03e7..1c439c4de 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.base/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.base</artifactId> <packaging>eclipse-plugin</packaging> <name>base</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF index 26f16efc1..666c782c1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Activator: com.android.ide.eclipse.ddms.DdmsPlugin Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml b/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml index 7a7de8510..3c48c8fb4 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.ddms</artifactId> <packaging>eclipse-plugin</packaging> <name>ddms</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF index 7e77085fd..106dcff4d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: gldebugger-tests Bundle-SymbolicName: com.android.ide.eclipse.gldebugger.tests -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit4;bundle-version="4.5.0";resolution:=optional, com.android.ide.eclipse.gldebugger, diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml index 8850785cb..92fe8e326 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.gldebugger.tests</artifactId> <packaging>eclipse-test-plugin</packaging> <name>gldebugger.tests</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF index 434616529..ac5c5d590 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tracer for OpenGL ES Bundle-SymbolicName: com.android.ide.eclipse.gldebugger;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Activator: com.android.ide.eclipse.gltrace.GlTracePlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml index 4b7a4eb3e..dcbc58a8e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.gldebugger</artifactId> <packaging>eclipse-plugin</packaging> <name>gldebugger</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF index 59fc8a8ec..55cc9120f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Hierarchy Viewer Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Activator: com.android.ide.eclipse.hierarchyviewer.HierarchyViewerPlugin Bundle-Vendor: The Android Open Source Project Bundle-Localization: plugin diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml index 6a2b4803a..162d38e33 100644 --- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.hierarchyviewer</artifactId> <packaging>eclipse-plugin</packaging> <name>hierarchyviewer</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF index 30e5a8d23..5d369ccc9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.android.ide.eclipse.monitor;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Activator: com.android.ide.eclipse.monitor.MonitorPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties index ad5a3a348..a16edf635 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties @@ -4,5 +4,5 @@ Bundle-Vendor = The Android Open Source Project Bundle-Name = Monitor aboutText = \n\ Android Device Monitor\n\ -Version: 24.4.0 \n\ +Version: 24.4.1 \n\ Copyright 2012, The Android Open Source Project \n\ diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml b/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml index 98d8d3005..aa9237ca2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.monitor</artifactId> <packaging>eclipse-plugin</packaging> <name>monitor</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF index 23a162404..e3b558a96 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT CDT Integration Bundle-SymbolicName: com.android.ide.eclipse.ndk;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Activator: com.android.ide.eclipse.ndk.internal.Activator Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml b/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml index 0b3c13cea..a4904b364 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.ndk</artifactId> <packaging>eclipse-plugin</packaging> <name>ndk</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF index 66c237f86..4d4ff6f87 100644 --- a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pdt Bundle-SymbolicName: com.android.ide.eclipse.pdt;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF index db1a32bf9..0ef4e84da 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Android Plugin Tests Bundle-SymbolicName: com.android.ide.eclipse.tests -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Vendor: The Android Open Source Project Fragment-Host: com.android.ide.eclipse.adt;bundle-version="21.0.0" Require-Bundle: org.junit diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml b/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml index 4d656c58f..12297110c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.tests</artifactId> <packaging>eclipse-test-plugin</packaging> <name>tests</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF index 55b6378a0..eebdf4ef7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Traceview Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true -Bundle-Version: 24.4.0.qualifier +Bundle-Version: 24.4.1.qualifier Bundle-Activator: com.android.ide.eclipse.traceview.TraceviewPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml b/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml index c7bb7086c..15993f33a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>24.4.0-SNAPSHOT</version> + <version>24.4.1-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.traceview</artifactId> <packaging>eclipse-plugin</packaging> <name>traceview</name> diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml index 6488cc419..4694d1573 100644 --- a/eclipse/sites/external/site.xml +++ b/eclipse/sites/external/site.xml @@ -3,22 +3,22 @@ <description url="https://dl-ssl.google.com/android/eclipse/"> Update Site for Android Development Toolkit </description> - <feature url="features/com.android.ide.eclipse.adt_24.4.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_24.4.1.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.4.1.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_24.4.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_24.4.1.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.4.1.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.4.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.4.1.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.4.1.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_24.4.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_24.4.1.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.4.1.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_24.4.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_24.4.1.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.4.1.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ndk_24.4.0.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.ndk_24.4.1.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.4.1.qualifier"> <category name="ndk"/> </feature> <category-def name="developer" label="Developer Tools"> diff --git a/eclipse/sites/internal/site.xml b/eclipse/sites/internal/site.xml index 2260aa2b1..5ae72345d 100644 --- a/eclipse/sites/internal/site.xml +++ b/eclipse/sites/internal/site.xml @@ -3,32 +3,32 @@ <description url="https://android.corp.google.com/adt/"> Update Site for Android Development Toolkit </description> - <feature url="features/com.android.ide.eclipse.adt_24.4.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_24.4.1.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.4.1.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_24.4.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_24.4.1.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.4.1.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.4.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.4.1.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.4.1.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.tests_24.4.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.tests_24.4.1.qualifier.jar" id="com.android.ide.eclipse.tests" version="24.4.1.qualifier"> <category name="test"/> </feature> - <feature url="features/com.android.ide.eclipse.pdt_24.4.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.pdt_24.4.1.qualifier.jar" id="com.android.ide.eclipse.pdt" version="24.4.1.qualifier"> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_24.4.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_24.4.1.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.4.1.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_24.4.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_24.4.1.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.4.1.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.ndk_24.4.0.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.4.0.qualifier"> + <feature url="features/com.android.ide.eclipse.ndk_24.4.1.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.4.1.qualifier"> <category name="developer"/> <category name="platform"/> </feature> diff --git a/files/tools_source.properties b/files/tools_source.properties index 54ab21908..806c0c98f 100644 --- a/files/tools_source.properties +++ b/files/tools_source.properties @@ -1,3 +1,3 @@ Pkg.UserSrc=false -Pkg.Revision=24.4.0 +Pkg.Revision=24.4.1 Platform.MinPlatformToolsRev=20 |
