am c78d07c6: am 61f99f13: am 245b5ea5: am 2af77026: am 67506023: am 05185e0e: am 48812401: am 7f23b1d0: am a8f117d3: am 5a571de3: am 1a30e186: am c8f7ca09: resolved conflicts for merge of 5830261a to jb-dev-plus-aosp
* commit 'c78d07c6e964f23dc12ba739aff49ff1bf74b323':
DO NOT MERGE opengl: Fix QemuPipeStream::readFully reading beyond end of buffer
diff --git a/bash_completion/adb.bash b/bash_completion/adb.bash
index c1793d9..397de8e 100644
--- a/bash_completion/adb.bash
+++ b/bash_completion/adb.bash
@@ -43,9 +43,7 @@
*)
if [[ $where == OPT_SERIAL ]]; then
where=OPT_SERIAL_ARG
- elif [[ $where == OPT_SERIAL_ARG ]]; then
serial=${cur}
- where=OPTIONS
else
where=COMMAND
break
diff --git a/eclipse/artifacts/bundles/category.xml b/eclipse/artifacts/bundles/category.xml
deleted file mode 100644
index e4c8f4c..0000000
--- a/eclipse/artifacts/bundles/category.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description url="https://dl-ssl.google.com/android/eclipse/">
- Update Site for Android Development Toolkit
- </description>
- <feature url="features/com.android.ide.eclipse.ddms_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.traceview_24.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.gldebugger_24.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.adt_24.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.adt.package_24.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.package.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.ndk_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <category-def name="developer" label="Developer Tools">
- <description>
- Features that add Android support to Eclipse for application developers.
- </description>
- </category-def>
-</site>
diff --git a/eclipse/artifacts/bundles/ide.p2.inf b/eclipse/artifacts/bundles/ide.p2.inf
deleted file mode 100644
index cabaa55..0000000
--- a/eclipse/artifacts/bundles/ide.p2.inf
+++ /dev/null
@@ -1,9 +0,0 @@
-#tell pde.build not to generate start levels
-org.eclipse.pde.build.append.startlevels=false
-
-requires.1.namespace=org.eclipse.equinox.p2.iu
-requires.1.name=org.eclipse.platform.ide
-requires.1.greedy=true
-
-instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//dl-ssl.google.com/android/eclipse/,type:0,name:Android Developer Tools Update Site,enabled:true);
diff --git a/eclipse/artifacts/bundles/ide.product b/eclipse/artifacts/bundles/ide.product
deleted file mode 100644
index d130861..0000000
--- a/eclipse/artifacts/bundles/ide.product
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="Eclipse IDE for Android Developers" uid="adtproduct" id="com.android.ide.eclipse.adt.package.adtproduct" application="org.eclipse.ui.ide.workbench" version="24.0.2.qualifier" useFeatures="true" includeLaunchers="true">
-
- <aboutInfo>
- <image path="/plugin-adt-package/adt-about.png"/>
- <text>
- Specified in the plugin.xml of the branding plugin.
- </text>
- </aboutInfo>
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-product com.android.ide.eclipse.adt.package.adtproduct</programArgs>
- <vmArgs>-Dosgi.requiredJavaVersion=1.6
--XX:MaxPermSize=256m
--Xms512m
--Xmx1024m</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
- </launcherArgs>
-
- <windowImages i16="/plugin-adt-package/icons/adt16.png" i32="/plugin-adt-package/icons/adt32.png" i48="/plugin-adt-package/icons/adt48.png"/>
-
- <splash
- location="com.android.ide.eclipse.adt.package" />
- <launcher name="eclipse">
- <solaris/>
- <win useIco="false">
- <bmp/>
- </win>
- </launcher>
-
-
- <vm>
- <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</linux>
- <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos>
- <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
- </vm>
-
- <plugins>
- </plugins>
-
- <features>
- <feature id="com.android.ide.eclipse.adt.package.feature" version="24.0.2.qualifier"/>
- </features>
-
- <configurations>
- <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="0" />
- <property name="eclipse.product" value="com.android.ide.eclipse.adt.package.adtproduct" />
- <property name="org.eclipse.update.reconcile" value="false" />
- <property name="osgi.bundles.defaultStartLevel" value="4" />
- <property name="osgi.splashPath" value="platform\:/base/plugins/com.android.ide.eclipse.adt.package" />
- </configurations>
-
-</product>
diff --git a/eclipse/artifacts/bundles/monitor.product b/eclipse/artifacts/bundles/monitor.product
index 9b3c254..c8c0f38 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.0.2.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.3.3.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
diff --git a/eclipse/artifacts/bundles/pom.xml b/eclipse/artifacts/bundles/pom.xml
index ca2fe35..3e8df67 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-SNAPSHOT</version>
<artifactId>bundles</artifactId>
<packaging>eclipse-repository</packaging>
<name>bundles</name>
@@ -50,11 +50,6 @@
<attachId>com.android.ide.eclipse.monitor.product</attachId>
<rootFolder>monitor</rootFolder>
</product>
- <product>
- <id>adtproduct</id>
- <attachId>adtproduct</attachId>
- <rootFolder>adt</rootFolder>
- </product>
</products>
</configuration>
</plugin>
diff --git a/eclipse/artifacts/p2repo/.project b/eclipse/artifacts/p2repo/.project
deleted file mode 100644
index 5360679..0000000
--- a/eclipse/artifacts/p2repo/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>tycho-p2repo</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/eclipse/artifacts/p2repo/category.xml b/eclipse/artifacts/p2repo/category.xml
deleted file mode 100644
index 5fa6ce0..0000000
--- a/eclipse/artifacts/p2repo/category.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description url="https://dl-ssl.google.com/android/eclipse/">
- Update Site for Android Development Toolkit
- </description>
- <feature url="features/com.android.ide.eclipse.ddms_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.traceview_24.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.gldebugger_24.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.adt_24.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <feature url="features/com.android.ide.eclipse.ndk_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="24.0.2.qualifier">
- <category name="developer"/>
- </feature>
- <category-def name="developer" label="Developer Tools">
- <description>
- Features that add Android support to Eclipse for application developers.
- </description>
- </category-def>
-</site>
diff --git a/eclipse/artifacts/p2repo/pom.xml b/eclipse/artifacts/p2repo/pom.xml
deleted file mode 100644
index acce877..0000000
--- a/eclipse/artifacts/p2repo/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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.0.2-SNAPSHOT</version>
- <artifactId>p2repo</artifactId>
- <packaging>eclipse-repository</packaging>
- <name>p2repo</name>
-
- <parent>
- <relativePath>../../pom.xml</relativePath>
- <groupId>adt.group</groupId>
- <artifactId>parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-</project>
diff --git a/eclipse/build.gradle b/eclipse/build.gradle
index c483ce7..5624821 100644
--- a/eclipse/build.gradle
+++ b/eclipse/build.gradle
@@ -8,9 +8,17 @@
// get tools/base version
apply from: "../../tools/buildSrc/base/version.gradle"
+ext.outPath = System.env.OUT_DIR
+if (outPath != null) {
+ ext.outFile = new File(outPath)
+} else {
+ outPath = '../../out'
+ ext.outFile = new File(projectDir, outPath)
+}
+
repositories {
maven { url '../../prebuilts/tools/common/m2/repository' }
- maven { url '../../out/repo' }
+ maven { url outPath + '/repo' }
}
ext {
@@ -132,7 +140,7 @@
// unzip eclipse prebuilts into the out folder to create a target platform for the build
task unzipTargetPlatform << {
- File targetDir = new File(projectDir, "../../out/host/maven/target").getCanonicalFile()
+ File targetDir = new File(outFile, "/host/maven/target").getCanonicalFile()
targetDir.mkdirs()
project.targetComponents.each { String k, File v ->
@@ -144,7 +152,7 @@
task buildEclipse(type: Exec, dependsOn: unzipTargetPlatform) {
def maven = new File(projectDir, "../../prebuilts/eclipse/maven/apache-maven-3.2.1/bin/mvn").getCanonicalFile()
- def androidOut = new File(projectDir, "../../out").getCanonicalPath()
+ def androidOut = outFile.getCanonicalPath()
environment("M2_HOME", maven.getParentFile().getParentFile().getCanonicalPath())
workingDir projectDir
commandLine maven.getCanonicalPath(), "-s", "settings.xml", "-DforceContextQualifier=$project.buildNumber", "-DANDROID_OUT=$androidOut", "package"
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 450aeb4..56eeaaf 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.0.2.qualifier"
+ version="24.3.3.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 a71c9e5..2ed5049 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 0020730..61bfbb0 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.0.2.qualifier"
+ version="24.3.3.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 a3ff33f..30e504d 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 1724cf5..812a9f2 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.0.2.qualifier"
+ version="24.3.3.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 c17e681..fc9680d 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 20d8a0e..2259187 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.0.2.qualifier"
+ version="24.3.3.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 878d366..65f086f 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 e368b30..b9b3596 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.0.2.qualifier"
+ version="24.3.3.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 90e22f4..119476a 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 2ac17c9..5720908 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.0.2.qualifier"
+ version="24.3.3.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 58564cb..a59a05f 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 e7dccd3..8a8407e 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.0.2.qualifier"
+ version="24.3.3.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 4034fe5..87da6f3 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 7c21ee0..446509a 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.0.2.qualifier"
+ version="24.3.3.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 d91a7bf..965e3ec 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.0.2.qualifier"
+ version="24.3.3.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 c43f4f2..43793a6 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.0.2.qualifier"
+ version="24.3.3.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 033658d..eea0f7f 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 5fde8f5..da8adcf 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.0.2-SNAPSHOT/products/"
+def basePath = "../../../out/host/maven/bundles-24.3.3-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 b0c58b6..d1f897e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ADT XML Overlay
Bundle-SymbolicName: overlay.com.android.ide.eclipse.adt.overlay;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 d319321..6dbe3d2 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 34bbed6..999aead 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ADT Package
Bundle-SymbolicName: com.android.ide.eclipse.adt.package;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 e40782d..f6000ce 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 7cf3912..3115f79 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Android Development Toolkit
Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 f440c87..a0257be 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
index bd6a55a..3dd4240 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java
@@ -36,6 +36,7 @@
import com.android.tools.lint.client.api.IssueRegistry;
import com.android.tools.lint.client.api.JavaParser;
import com.android.tools.lint.client.api.LintClient;
+import com.android.tools.lint.client.api.LintDriver;
import com.android.tools.lint.client.api.XmlParser;
import com.android.tools.lint.detector.api.ClassContext;
import com.android.tools.lint.detector.api.Context;
@@ -368,7 +369,7 @@
@NonNull
@Override
- public Configuration getConfiguration(@NonNull Project project) {
+ public Configuration getConfiguration(@NonNull Project project, @Nullable LintDriver driver) {
return getConfigurationFor(project);
}
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 6db8feb..f6cb3de 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Android Utilities
Bundle-SymbolicName: com.android.ide.eclipse.base;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 dbce995..b3f7ed1 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 92ac9f1..92868ce 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 3f0f90c..5f43936 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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.ddms/src/com/android/ide/eclipse/ddms/systrace/SystraceOptionsDialogV2.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/systrace/SystraceOptionsDialogV2.java
index 208ff38..e28edd3 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/systrace/SystraceOptionsDialogV2.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/systrace/SystraceOptionsDialogV2.java
@@ -50,7 +50,7 @@
"Settings to use while capturing system level trace";
private static final String DEFAULT_TRACE_FNAME = "trace.html"; //$NON-NLS-1$
private static final Set<String> sCommonTags = ImmutableSet.of(
- "app", "dalvik", "gfx", "res", "rs", "sched", "view", "webview");
+ "am", "app", "dalvik", "disk", "gfx", "input", "res", "sched", "view", "webview", "wm");
private Text mDestinationText;
private String mDestinationPath;
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 55a61dd..240874b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: gldebugger-tests
Bundle-SymbolicName: com.android.ide.eclipse.gldebugger.tests
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 6c2d1b4..f87e88a 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 68f4d28..96177db 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tracer for OpenGL ES
Bundle-SymbolicName: com.android.ide.eclipse.gldebugger;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 c8f7a0e..a2a8cef 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 f28447d..b57d20c 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Hierarchy Viewer
Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 c37dc56..133fe09 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 8bf0e01..48a3aa3 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.android.ide.eclipse.monitor;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 5b80fcf..f25aa6e 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-Name = Monitor
aboutText = \n\
Android Device Monitor\n\
-Version: 24.0.2 \n\
+Version: 24.3.3 \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 0ec7d9b..425057f 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 7f60dd2..df1e88c 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ADT CDT Integration
Bundle-SymbolicName: com.android.ide.eclipse.ndk;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 e78f628..53d9c47 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 6c9c4af..a888ae4 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Pdt
Bundle-SymbolicName: com.android.ide.eclipse.pdt;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 37dbc78..8289d64 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Android Plugin Tests
Bundle-SymbolicName: com.android.ide.eclipse.tests
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 ed90b3b..71bbad8 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-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 2a47a90..8e03134 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Traceview
Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true
-Bundle-Version: 24.0.2.qualifier
+Bundle-Version: 24.3.3.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 c911b83..e0a4df7 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.0.2-SNAPSHOT</version>
+ <version>24.3.3-SNAPSHOT</version>
<artifactId>com.android.ide.eclipse.traceview</artifactId>
<packaging>eclipse-plugin</packaging>
<name>traceview</name>
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
index 025fc98..36e500c 100644
--- a/eclipse/pom.xml
+++ b/eclipse/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- This script builds Eclipse plugins, and the monitor & adt-bundle products.
+ This script builds the monitor product which is composed of a bunch of Eclipse plugins.
To run this script:
- Have Maven3 in your path
@@ -57,36 +57,6 @@
<url>${target-platform.base.url}/jdt</url>
<layout>p2</layout>
</repository>
- <repository>
- <id>cdt</id>
- <url>${target-platform.base.url}/cdt</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>emf</id>
- <url>${target-platform.base.url}/emf</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>wtp</id>
- <url>${target-platform.base.url}/wtp</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>gef</id>
- <url>${target-platform.base.url}/gef</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>pde</id>
- <url>${target-platform.base.url}/pde</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>egit</id>
- <url>${target-platform.base.url}/egit</url>
- <layout>p2</layout>
- </repository>
</repositories>
</profile>
<profile>
@@ -109,22 +79,12 @@
<module>plugins/com.android.ide.eclipse.monitor</module>
<module>plugins/com.android.ide.eclipse.traceview</module>
- <module>plugins/com.android.ide.eclipse.adt</module>
- <module>plugins/com.android.ide.eclipse.adt.overlay</module>
- <module>plugins/com.android.ide.eclipse.adt.package</module>
- <module>plugins/com.android.ide.eclipse.ndk</module>
-
<module>features/com.android.ide.eclipse.ddms</module>
<module>features/com.android.ide.eclipse.gldebugger</module>
<module>features/com.android.ide.eclipse.hierarchyviewer</module>
<module>features/com.android.ide.eclipse.traceview</module>
<module>features/com.android.ide.eclipse.monitor</module>
- <module>features/com.android.ide.eclipse.adt</module>
- <module>features/com.android.ide.eclipse.adt.package</module>
- <module>features/com.android.ide.eclipse.ndk</module>
-
- <module>artifacts/p2repo</module>
<module>artifacts/bundles</module>
</modules>
@@ -138,14 +98,6 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
- <!--
- <target>
- <artifact>
- <groupId>adt.group</groupId>
- <artifactId>helios</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </artifact>
- </target> -->
<environments>
<environment>
<os>win32</os>
diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml
index bc262b6..f16898c 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.0.2.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt_24.3.3.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.3.3.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ddms_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.ddms_24.3.3.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.3.3.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.3.3.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.3.3.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.traceview_24.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.traceview_24.3.3.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.3.3.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.gldebugger_24.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.gldebugger_24.3.3.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.3.3.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ndk_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.ndk_24.3.3.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.3.3.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 b77ab7f..d5cb3fd 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.0.2.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt_24.3.3.qualifier.jar" id="com.android.ide.eclipse.adt" version="24.3.3.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ddms_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.ddms_24.3.3.qualifier.jar" id="com.android.ide.eclipse.ddms" version="24.3.3.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.hierarchyviewer_24.3.3.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="24.3.3.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.tests_24.0.2.qualifier.jar" id="com.android.ide.eclipse.tests" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.tests_24.3.3.qualifier.jar" id="com.android.ide.eclipse.tests" version="24.3.3.qualifier">
<category name="test"/>
</feature>
- <feature url="features/com.android.ide.eclipse.pdt_24.0.2.qualifier.jar" id="com.android.ide.eclipse.pdt" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.pdt_24.3.3.qualifier.jar" id="com.android.ide.eclipse.pdt" version="24.3.3.qualifier">
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.traceview_24.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.traceview_24.3.3.qualifier.jar" id="com.android.ide.eclipse.traceview" version="24.3.3.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.gldebugger_24.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.gldebugger_24.3.3.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="24.3.3.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ndk_24.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.0.2.qualifier">
+ <feature url="features/com.android.ide.eclipse.ndk_24.3.3.qualifier.jar" id="com.android.ide.eclipse.ndk" version="24.3.3.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
diff --git a/files/ant/build.xml b/files/ant/build.xml
index 222e7d1..aab440c 100644
--- a/files/ant/build.xml
+++ b/files/ant/build.xml
@@ -481,10 +481,6 @@
<target name="-build-setup" depends="-setup">
<!-- find location of build tools -->
<getbuildtools name="android.build.tools.dir" verbose="${verbose}" />
- <property name="aidl" location="${android.build.tools.dir}/aidl${exe}" />
- <property name="aapt" location="${android.build.tools.dir}/aapt${exe}" />
- <property name="dx" location="${android.build.tools.dir}/dx${bat}" />
- <property name="zipalign" location="${android.build.tools.dir}/zipalign${exe}" />
<!-- read the previous build mode -->
<property file="${out.build.prop.file}" />
diff --git a/files/proguard-android-optimize.txt b/files/proguard-android-optimize.txt
index f8f5bcb..3e671f7 100644
--- a/files/proguard-android-optimize.txt
+++ b/files/proguard-android-optimize.txt
@@ -50,8 +50,8 @@
public static ** valueOf(java.lang.String);
}
--keep class * implements android.os.Parcelable {
- public static final android.os.Parcelable$Creator *;
+-keepclassmembers class * implements android.os.Parcelable {
+ public static final android.os.Parcelable$Creator CREATOR;
}
-keepclassmembers class **.R$* {
diff --git a/files/proguard-android.txt b/files/proguard-android.txt
index fe73bae..5f25493 100644
--- a/files/proguard-android.txt
+++ b/files/proguard-android.txt
@@ -43,8 +43,8 @@
public static ** valueOf(java.lang.String);
}
--keep class * implements android.os.Parcelable {
- public static final android.os.Parcelable$Creator *;
+-keepclassmembers class * implements android.os.Parcelable {
+ public static final android.os.Parcelable$Creator CREATOR;
}
-keepclassmembers class **.R$* {
diff --git a/files/tools_source.properties b/files/tools_source.properties
index a77cdd5..0be07dc 100644
--- a/files/tools_source.properties
+++ b/files/tools_source.properties
@@ -1,3 +1,3 @@
Pkg.UserSrc=false
-Pkg.Revision=24.0.2
+Pkg.Revision=24.3.3
Platform.MinPlatformToolsRev=20
