diff options
46 files changed, 81 insertions, 116 deletions
diff --git a/build/tools.atree b/build/tools.atree index bc0389d51..3355d6df1 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -52,7 +52,6 @@ bin/dmtracedump strip tools/dmtracedump bin/etc1tool strip tools/etc1tool bin/hprof-conv strip tools/hprof-conv bin/mksdcard strip tools/mksdcard -bin/zipalign strip tools/zipalign # emulator bin/emulator strip tools/emulator diff --git a/build/tools.windows.atree b/build/tools.windows.atree index 5e5e7665d..2ae2db12b 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -89,9 +89,6 @@ prebuilts/devtools/tools/traceview.bat tools/traceview.bat rm tools/uiautomatorviewer prebuilts/devtools/tools/uiautomatorviewer.bat tools/uiautomatorviewer.bat -rm tools/zipalign -bin/zipalign.exe strip tools/zipalign.exe - # RCP Monitor. Remove linux stuff and replace by Windows files. rm tools/monitor rm tools/lib/monitor-x86 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 1ee1d5286..33533ac15 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" label="ADT Package" - version="22.6.1.qualifier" + version="22.6.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.adt.package"> @@ -73,12 +73,12 @@ <import plugin="org.eclipse.cdt.dsf.gdb.ui"/> <import plugin="org.eclipse.cdt.launch"/> <import feature="org.eclipse.egit" /> - <import feature="com.android.ide.eclipse.ddms" version="22.6.1" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.adt" version="22.6.1" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.gldebugger" version="22.6.1" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.hierarchyviewer" version="22.6.1" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.ndk" version="22.6.1" match="greaterOrEqual" /> - <import feature="com.android.ide.eclipse.traceview" version="22.6.1" match="greaterOrEqual" /> + <import feature="com.android.ide.eclipse.ddms" version="22.6.2" match="greaterOrEqual" /> + <import feature="com.android.ide.eclipse.adt" version="22.6.2" match="greaterOrEqual" /> + <import feature="com.android.ide.eclipse.gldebugger" version="22.6.2" match="greaterOrEqual" /> + <import feature="com.android.ide.eclipse.hierarchyviewer" version="22.6.2" match="greaterOrEqual" /> + <import feature="com.android.ide.eclipse.ndk" version="22.6.2" match="greaterOrEqual" /> + <import feature="com.android.ide.eclipse.traceview" version="22.6.2" match="greaterOrEqual" /> <!-- The build scripts will pull in the translation plugin if its plugin repository is accessible. The following line should remain without any modifications as the build script looks for diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/p2.inf b/eclipse/features/com.android.ide.eclipse.adt.package/p2.inf index cabaa55dc..93a365c6f 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.package/p2.inf +++ b/eclipse/features/com.android.ide.eclipse.adt.package/p2.inf @@ -6,4 +6,4 @@ 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); +org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:https${#58}//dl.google.com/android/eclipse/,type:0,name:Android Developer Tools Update Site,enabled:true); diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index b791b5ea0..1ff56e885 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" label="Android Development Tools" - version="22.6.1.qualifier" + version="22.6.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.adt"> diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml index a8b263b7a..9a5ae3b3c 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" label="Android DDMS" - version="22.6.1.qualifier" + version="22.6.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.ddms"> diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml index 93a164afe..1e1fda09d 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" label="Tracer for OpenGL ES" - version="22.6.1.qualifier" + version="22.6.2.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml index 826ef65a9..17080b319 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" label="Android Hierarchy Viewer" - version="22.6.1.qualifier" + version="22.6.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.hierarchyviewer"> diff --git a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml index 4dadd3fce..5fb8209e5 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" label="Android Native Development Tools" - version="22.6.1.qualifier" + version="22.6.2.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml index 0c2c2ed3a..75de6a909 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="22.6.1.qualifier" + version="22.6.2.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 10a52fa72..a42ca335d 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="22.6.1.qualifier" + version="22.6.2.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 b6bcaf21e..b07708f80 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" label="Android Traceview" - version="22.6.1.qualifier" + version="22.6.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.traceview"> 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 dcec171f4..b870c3e76 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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.package/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF index 49d126122..049f85920 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.qualifier Bundle-Vendor: The Android Open Source Project Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.platform, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product b/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product index 8852beb48..cef08ba3b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Android Developer Tools" uid="com.android.ide.eclipse.adt.package.product" id="com.android.ide.eclipse.adt.package.product" application="org.eclipse.ui.ide.workbench" version="22.6.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Android Developer Tools" uid="com.android.ide.eclipse.adt.package.product" id="com.android.ide.eclipse.adt.package.product" application="org.eclipse.ui.ide.workbench" version="22.6.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> 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 fc21586c5..8755d4122 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.qualifier Bundle-ClassPath: ., libs/sdkuilib.jar, libs/ninepatch.jar, 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 36b6845ad..4b3720edb 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy 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 2f66dff02..8b0389ab8 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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.gldebugger.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF index 8dcaa491c..119da2838 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF index 59ee583cd..645e5c5bf 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF index 407293a1e..958dad3df 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF index 43a45c777..f533e2b72 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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/monitor.product b/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product index 74c8270ad..9df7cf94f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/monitor.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="monitor" uid="com.android.ide.eclipse.monitor.product.config" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="22.6.1" useFeatures="false" includeLaunchers="true"> +<product name="monitor" uid="com.android.ide.eclipse.monitor.product.config" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="22.6.2" useFeatures="false" includeLaunchers="true"> <configIni use="default"> diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties index 594b66126..ba150be97 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: 22.6.1 \n\ +Version: 22.6.2 \n\ Copyright 2012, The Android Open Source Project \n\ 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 db5d3230c..9eec5f2a7 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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.pdt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF index 29e0e7c16..43b13c89a 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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 342d67dfb..fc2c92780 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.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.traceview/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF index a041ac777..0b061b829 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: 22.6.1.qualifier +Bundle-Version: 22.6.2.qualifier Bundle-Activator: com.android.ide.eclipse.traceview.TraceviewPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml index 916aaaf9f..4d20d0333 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_22.6.1.qualifier.jar" id="com.android.ide.eclipse.adt" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_22.6.2.qualifier.jar" id="com.android.ide.eclipse.adt" version="22.6.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_22.6.1.qualifier.jar" id="com.android.ide.eclipse.ddms" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_22.6.2.qualifier.jar" id="com.android.ide.eclipse.ddms" version="22.6.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_22.6.1.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_22.6.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="22.6.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_22.6.1.qualifier.jar" id="com.android.ide.eclipse.traceview" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_22.6.2.qualifier.jar" id="com.android.ide.eclipse.traceview" version="22.6.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_22.6.1.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_22.6.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="22.6.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ndk_22.6.1.qualifier.jar" id="com.android.ide.eclipse.ndk" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ndk_22.6.2.qualifier.jar" id="com.android.ide.eclipse.ndk" version="22.6.2.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 50c9f2bfa..203f6384c 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_22.6.1.qualifier.jar" id="com.android.ide.eclipse.adt" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_22.6.2.qualifier.jar" id="com.android.ide.eclipse.adt" version="22.6.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_22.6.1.qualifier.jar" id="com.android.ide.eclipse.ddms" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_22.6.2.qualifier.jar" id="com.android.ide.eclipse.ddms" version="22.6.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_22.6.1.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_22.6.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="22.6.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.tests_22.6.1.qualifier.jar" id="com.android.ide.eclipse.tests" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.tests_22.6.2.qualifier.jar" id="com.android.ide.eclipse.tests" version="22.6.2.qualifier"> <category name="test"/> </feature> - <feature url="features/com.android.ide.eclipse.pdt_22.6.1.qualifier.jar" id="com.android.ide.eclipse.pdt" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.pdt_22.6.2.qualifier.jar" id="com.android.ide.eclipse.pdt" version="22.6.2.qualifier"> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_22.6.1.qualifier.jar" id="com.android.ide.eclipse.traceview" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_22.6.2.qualifier.jar" id="com.android.ide.eclipse.traceview" version="22.6.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_22.6.1.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_22.6.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="22.6.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.ndk_22.6.1.qualifier.jar" id="com.android.ide.eclipse.ndk" version="22.6.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ndk_22.6.2.qualifier.jar" id="com.android.ide.eclipse.ndk" version="22.6.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> diff --git a/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp b/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp index e31dea574..58180edc7 100644 --- a/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp +++ b/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp @@ -273,28 +273,31 @@ EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay display, const EGLint * } //selection defaults + // NOTE: Some variables below are commented out to reduce compiler warnings. + // TODO(digit): Look if these variables are really needed or not, and if so + // fix the code to do it properly. EGLint surface_type = EGL_WINDOW_BIT; EGLint renderable_type = EGL_OPENGL_ES_BIT; - EGLBoolean bind_to_tex_rgb = EGL_DONT_CARE; - EGLBoolean bind_to_tex_rgba = EGL_DONT_CARE; + //EGLBoolean bind_to_tex_rgb = EGL_DONT_CARE; + //EGLBoolean bind_to_tex_rgba = EGL_DONT_CARE; EGLenum caveat = EGL_DONT_CARE; EGLint config_id = EGL_DONT_CARE; EGLBoolean native_renderable = EGL_DONT_CARE; EGLint native_visual_type = EGL_DONT_CARE; - EGLint max_swap_interval = EGL_DONT_CARE; - EGLint min_swap_interval = EGL_DONT_CARE; + //EGLint max_swap_interval = EGL_DONT_CARE; + //EGLint min_swap_interval = EGL_DONT_CARE; EGLint trans_red_val = EGL_DONT_CARE; EGLint trans_green_val = EGL_DONT_CARE; EGLint trans_blue_val = EGL_DONT_CARE; EGLenum transparent_type = EGL_NONE; - EGLint buffer_size = 0; + //EGLint buffer_size = 0; EGLint red_size = 0; EGLint green_size = 0; EGLint blue_size = 0; EGLint alpha_size = 0; EGLint depth_size = 0; EGLint frame_buffer_level = 0; - EGLint sample_buffers_num = 0; + //EGLint sample_buffers_num = 0; EGLint samples_per_pixel = 0; EGLint stencil_size = 0; @@ -318,7 +321,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay display, const EGLint * if(attrib_list[i+1] < 0) { RETURN_ERROR(EGL_FALSE,EGL_BAD_ATTRIBUTE); } - buffer_size = attrib_list[i+1]; + //buffer_size = attrib_list[i+1]; break; case EGL_RED_SIZE: if(attrib_list[i+1] < 0) { @@ -345,10 +348,10 @@ EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay display, const EGLint * alpha_size = attrib_list[i+1]; break; case EGL_BIND_TO_TEXTURE_RGB: - bind_to_tex_rgb = attrib_list[i+1]; + //bind_to_tex_rgb = attrib_list[i+1]; break; case EGL_BIND_TO_TEXTURE_RGBA: - bind_to_tex_rgba = attrib_list[i+1]; + //bind_to_tex_rgba = attrib_list[i+1]; break; case EGL_CONFIG_CAVEAT: if(attrib_list[i+1] != EGL_NONE && attrib_list[i+1] != EGL_SLOW_CONFIG && attrib_list[i+1] != EGL_NON_CONFORMANT_CONFIG) { @@ -373,13 +376,13 @@ EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay display, const EGLint * if(attrib_list[i+1] < 0) { RETURN_ERROR(EGL_FALSE,EGL_BAD_ATTRIBUTE); } - max_swap_interval = attrib_list[i+1]; + //max_swap_interval = attrib_list[i+1]; break; case EGL_MIN_SWAP_INTERVAL: if(attrib_list[i+1] < 0) { RETURN_ERROR(EGL_FALSE,EGL_BAD_ATTRIBUTE); } - min_swap_interval = attrib_list[i+1]; + //min_swap_interval = attrib_list[i+1]; break; case EGL_NATIVE_RENDERABLE: native_renderable = attrib_list[i+1]; @@ -394,7 +397,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay display, const EGLint * RETURN_ERROR(EGL_FALSE,EGL_BAD_ATTRIBUTE); } case EGL_SAMPLE_BUFFERS: - sample_buffers_num = attrib_list[i+1]; + //sample_buffers_num = attrib_list[i+1]; break; if(attrib_list[i+1] < 0) { RETURN_ERROR(EGL_FALSE,EGL_BAD_ATTRIBUTE); @@ -635,13 +638,11 @@ EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay display, EGLConfig con } ContextPtr sharedCtxPtr; - EGLNativeContextType nativeShared = NULL; if(share_context != EGL_NO_CONTEXT) { sharedCtxPtr = dpy->getContext(share_context); if(!sharedCtxPtr.Ptr()) { RETURN_ERROR(EGL_NO_CONTEXT,EGL_BAD_CONTEXT); } - nativeShared = sharedCtxPtr->nativeType(); } EGLNativeContextType globalSharedContext = dpy->getGlobalSharedContext(); @@ -858,7 +859,9 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void) { EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void) { EGLenum api = eglQueryAPI(); eglBindAPI(EGL_OPENGL_ES_API); - return eglWaitClient(); + EGLBoolean ret = eglWaitClient(); + eglBindAPI(api); + return ret; } EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine) { @@ -1012,7 +1015,6 @@ EglImage *attachEGLImage(unsigned int imageId) void detachEGLImage(unsigned int imageId) { ThreadInfo* thread = getThreadInfo(); - EglDisplay* dpy = static_cast<EglDisplay*>(thread->eglDisplay); ContextPtr ctx = thread->eglContext; if (ctx.Ptr()) { ctx->detachImage(imageId); diff --git a/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp b/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp index 460c0b643..c245ba521 100644 --- a/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp +++ b/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp @@ -193,7 +193,8 @@ HWND createDummyWindow(){ wcx.lpszClassName = "DummyWin"; // name of window class wcx.hIconSm = (HICON) NULL; // small class icon - ATOM winClass = RegisterClassEx(&wcx); + RegisterClassEx(&wcx); + HWND hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "DummyWin", "Dummy", @@ -340,7 +341,7 @@ EglConfig* pixelFormatToConfig(EGLNativeInternalDisplayType display,int renderab EGLint transparentType,samples; EGLint tRed,tGreen,tBlue; EGLint pMaxWidth,pMaxHeight,pMaxPixels; - EGLint configId,level; + EGLint level; EGLint window,bitmap,pbuffer,transparent; HDC dpy = getDummyDC(display,WinDisplay::DEFAULT_DISPLAY); @@ -416,10 +417,10 @@ void queryConfigs(EGLNativeInternalDisplayType display,int renderableType,Config initPixelFormat(dpy); //quering num of formats - int nFormats = DescribePixelFormat(dpy, iPixelFormat,sizeof(PIXELFORMATDESCRIPTOR), &pfd); + int maxFormat = DescribePixelFormat(dpy, iPixelFormat,sizeof(PIXELFORMATDESCRIPTOR), &pfd); //inserting rest of formats - for(iPixelFormat;iPixelFormat < nFormats; iPixelFormat++) { + for(;iPixelFormat <= maxFormat; iPixelFormat++) { DescribePixelFormat(dpy, iPixelFormat,sizeof(PIXELFORMATDESCRIPTOR), &pfd); EglConfig* pConfig = pixelFormatToConfig(display,renderableType,&pfd,iPixelFormat); if(pConfig) listOut.push_back(pConfig); @@ -497,7 +498,7 @@ EGLNativeSurfaceType createPbufferSurface(EGLNativeInternalDisplayType display,E if(!s_wglExtProcs->wglCreatePbufferARB) return NULL; EGLNativePbufferType pb = s_wglExtProcs->wglCreatePbufferARB(dpy,cfg->nativeId(),width,height,pbAttribs); if(!pb) { - DWORD err = GetLastError(); + GetLastError(); return NULL; } return new SrfcInfo(pb); @@ -507,7 +508,7 @@ bool releasePbuffer(EGLNativeInternalDisplayType display,EGLNativeSurfaceType pb if (!pb) return false; if(!s_wglExtProcs->wglReleasePbufferDCARB || !s_wglExtProcs->wglDestroyPbufferARB) return false; if(!s_wglExtProcs->wglReleasePbufferDCARB(pb->getPbuffer(),pb->getDC()) || !s_wglExtProcs->wglDestroyPbufferARB(pb->getPbuffer())){ - DWORD err = GetLastError(); + GetLastError(); return false; } return true; @@ -539,7 +540,7 @@ EGLNativeContextType createContext(EGLNativeInternalDisplayType display,EglConfi bool destroyContext(EGLNativeInternalDisplayType dpy,EGLNativeContextType ctx) { if(!wglDeleteContext(ctx)) { - DWORD err = GetLastError(); + GetLastError(); return false; } return true; @@ -566,7 +567,7 @@ bool makeCurrent(EGLNativeInternalDisplayType display,EglSurface* read,EglSurfac void swapBuffers(EGLNativeInternalDisplayType display,EGLNativeSurfaceType srfc){ if(srfc && !SwapBuffers(srfc->getDC())) { - DWORD err = GetLastError(); + GetLastError(); } } diff --git a/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp b/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp index 28ebca9df..7ab177f7c 100644 --- a/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp +++ b/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp @@ -699,8 +699,6 @@ GL_API void GL_APIENTRY glGetBooleanv( GLenum pname, GLboolean *params) { return; } - GLint i; - switch(pname) { case GL_FRAMEBUFFER_BINDING_OES: @@ -745,7 +743,6 @@ GL_API void GL_APIENTRY glGetBufferParameteriv( GLenum target, GLenum pname, GL GET_CTX() SET_ERROR_IF(!(GLEScmValidate::bufferTarget(target) && GLEScmValidate::bufferParam(pname)),GL_INVALID_ENUM); SET_ERROR_IF(!ctx->isBindedBuffer(target),GL_INVALID_OPERATION); - bool ret = true; switch(pname) { case GL_BUFFER_SIZE: ctx->getBufferSize(target,params); @@ -787,7 +784,6 @@ GL_API void GL_APIENTRY glGetFixedv( GLenum pname, GLfixed *params) { size_t nParams = glParamSize(pname); GLfloat fParams[16]; - GLint i; switch(pname) { diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp b/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp index c3886d366..c96ba52dd 100644 --- a/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp +++ b/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp @@ -867,7 +867,6 @@ GL_APICALL void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GET_CTX(); SET_ERROR_IF(!(GLESv2Validate::bufferTarget(target) && GLESv2Validate::bufferParam(pname)),GL_INVALID_ENUM); SET_ERROR_IF(!ctx->isBindedBuffer(target),GL_INVALID_OPERATION); - bool ret = true; switch(pname) { case GL_BUFFER_SIZE: ctx->getBufferSize(target,params); diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp b/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp index 311a9ed9c..940538a7f 100644 --- a/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp +++ b/emulator/opengl/host/libs/Translator/GLES_V2/ShaderParser.cpp @@ -224,8 +224,7 @@ void ShaderParser::parseOmitPrecision(){ SEMICOLON } statementState = PRECISION; const char *precision = NULL; - const char *delimiter = NULL; - + enum { PARSE_NONE, PARSE_IN_C_COMMENT, diff --git a/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp b/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp index 54aa20033..c0e3c5c5a 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp +++ b/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp @@ -49,19 +49,19 @@ static GL_FUNC_PTR getGLFuncAddress(const char *funcName) { if(name == NULL){ \ funcAddrs = (void *)getGLFuncAddress(#name); \ if(funcAddrs){ \ - *(void**)(&name) = funcAddrs; \ + *(void**)(void*)(&name) = funcAddrs; \ } else { \ fprintf(stderr,"could not load func %s\n",#name); \ - *(void**)(&name) = (void *)dummy_##name; \ + *(void**)(void*)(&name) = (void *)dummy_##name; \ } \ } \ } -#define LOAD_GLEXT_FUNC(name) { void * funcAddrs = NULL; \ +#define LOAD_GLEXT_FUNC(name) { void * funcAddrs = NULL; \ if(name == NULL){ \ funcAddrs = (void *)getGLFuncAddress(#name); \ if(funcAddrs) \ - *(void**)(&name) = funcAddrs; \ + *(void**)(void*)(&name) = funcAddrs; \ } \ } diff --git a/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp b/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp index 46f039cc5..c0519c48e 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp +++ b/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp @@ -330,10 +330,8 @@ void GLEScontext::convertDirectVBO(GLESConversionArrays& cArrs,GLint first,GLsiz RangeList ranges; RangeList conversions; GLushort* indices = NULL; - GLenum type = p->getType(); int attribSize = p->getSize(); int stride = p->getStride()?p->getStride():sizeof(GLfixed)*attribSize; - unsigned int size = p->getStride()?p->getStride()*count:attribSize*count*sizeof(GLfixed); char* data = (char*)p->getBufferData() + (first*stride); if(p->bufferNeedConversion()) { @@ -389,7 +387,6 @@ void GLEScontext::convertIndirectVBO(GLESConversionArrays& cArrs,GLsizei count,G RangeList ranges; RangeList conversions; GLushort* conversionIndices = NULL; - GLenum type = p->getType(); int attribSize = p->getSize(); int stride = p->getStride()?p->getStride():sizeof(GLfixed)*attribSize; char* data = static_cast<char*>(p->getBufferData()); diff --git a/emulator/opengl/host/tools/emugen/ApiGen.cpp b/emulator/opengl/host/tools/emugen/ApiGen.cpp index 2c331b983..6d6742d95 100644 --- a/emulator/opengl/host/tools/emugen/ApiGen.cpp +++ b/emulator/opengl/host/tools/emugen/ApiGen.cpp @@ -776,12 +776,10 @@ int ApiGen::genDecoderImpl(const std::string &filename) \tchar lastCall[256] = {0}; \n\ #endif \n\ \twhile ((len - pos >= 8) && !unknownOpcode) { \n\ -\t\tvoid *params[%u]; \n\ \t\tint opcode = *(int *)ptr; \n\ \t\tunsigned int packetLen = *(int *)(ptr + 4);\n\ \t\tif (len - pos < packetLen) return pos; \n\ -\t\tswitch(opcode) {\n", - (unsigned) m_maxEntryPointsParams); +\t\tswitch(opcode) {\n"); for (size_t f = 0; f < n; f++) { enum Pass_t { PASS_TmpBuffAlloc = 0, PASS_MemAlloc, PASS_DebugPrint, PASS_FunctionCall, PASS_Epilog, PASS_LAST }; diff --git a/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp b/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp index db7f41860..59f7b97cf 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp +++ b/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp @@ -258,7 +258,7 @@ GLenum GLSharedGroup::subUpdateBufferData(GLuint bufferId, GLintptr offset, GLsi void GLSharedGroup::deleteBufferData(GLuint bufferId) { emugl::Mutex::AutoLock _lock(m_lock); - ssize_t idx = m_buffers.remove(bufferId); + (void) m_buffers.remove(bufferId); } void GLSharedGroup::addProgramData(GLuint program) diff --git a/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp b/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp index 3ef4c6f1d..726d3591f 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp +++ b/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp @@ -112,7 +112,6 @@ int SocketStream::writeFully(const void* buffer, size_t size) const unsigned char *SocketStream::readFully(void *buf, size_t len) { - const unsigned char* ret = NULL; if (!valid()) return NULL; if (!buf) { return NULL; // do not allow NULL buf in that implementation diff --git a/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp b/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp index 76907a0ba..dcfb0c025 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp +++ b/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp @@ -193,8 +193,6 @@ int Win32PipeStream::commitBuffer(size_t size) const unsigned char *Win32PipeStream::readFully(void *buf, size_t len) { - const unsigned char* ret = NULL; - if (m_pipe == INVALID_HANDLE_VALUE) return NULL; diff --git a/emulator/opengl/shared/emugl/common/pod_vector.cpp b/emulator/opengl/shared/emugl/common/pod_vector.cpp index 3fe8f159b..c8ec3a69b 100644 --- a/emulator/opengl/shared/emugl/common/pod_vector.cpp +++ b/emulator/opengl/shared/emugl/common/pod_vector.cpp @@ -90,7 +90,6 @@ void PodVectorBase::resize(size_t newSize, size_t itemSize) { } void PodVectorBase::reserve(size_t newSize, size_t itemSize) { - const size_t kMaxSize = maxItemCapacity(itemSize); if (newSize == 0) { ::free(mBegin); mBegin = NULL; diff --git a/emulator/opengl/shared/emugl/common/pod_vector.h b/emulator/opengl/shared/emugl/common/pod_vector.h index 22a8a1d5a..c4e184bdf 100644 --- a/emulator/opengl/shared/emugl/common/pod_vector.h +++ b/emulator/opengl/shared/emugl/common/pod_vector.h @@ -73,12 +73,10 @@ protected: const void* end() const { return mEnd; } void* itemAt(size_t pos, size_t itemSize) { - const size_t kMaxCapacity = SIZE_MAX / itemSize; return mBegin + pos * itemSize; } const void* itemAt(size_t pos, size_t itemSize) const { - const size_t kMaxCapacity = SIZE_MAX / itemSize; return mBegin + pos * itemSize; } diff --git a/emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp b/emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp index ce65ccaa2..60118b7cd 100644 --- a/emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp +++ b/emulator/opengl/tests/translator_tests/GLES_CM/triangleCM.cpp @@ -148,9 +148,6 @@ int main(int argc, char **argv) bool useCopy = false; bool useSubCopy = false; - int c; - extern char *optarg; - #ifdef _WIN32 HWND windowId = NULL; #elif __linux__ diff --git a/emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp b/emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp index 732a19a8a..3a8ff0fe1 100644 --- a/emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp +++ b/emulator/opengl/tests/translator_tests/GLES_V2/triangleV2.cpp @@ -313,20 +313,6 @@ int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int n int main(int argc, char **argv) #endif { - GLuint ui32Vbo = 0; // Vertex buffer object handle - GLuint ui32IndexVbo; - GLuint ui32Texture; - - int nframes = 100; - bool immidateMode = false; - bool useIndices = false; - bool useTexture = true; - bool useCompTexture = false; - bool useFixed = true; - bool usePoints = false; - bool useCopy = false; - bool useSubCopy = false; - #ifdef _WIN32 int argc; char **argv = parseCmdLine(lpCmdLine, &argc); diff --git a/files/tools_source.properties b/files/tools_source.properties index f3d9623a0..62a9bafd3 100644 --- a/files/tools_source.properties +++ b/files/tools_source.properties @@ -1,3 +1,3 @@ Pkg.UserSrc=false -Pkg.Revision=22.6.1 +Pkg.Revision=22.6.2 Platform.MinPlatformToolsRev=18 |