[androidsdk-tools] 02/02: Imported Debian patch 22.2+git20130830~92d25d6-1
Tony Mancill
tmancill at moszumanska.debian.org
Sun Nov 23 23:43:29 GMT 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository androidsdk-tools.
commit 608436419b3abf5a59a31899ed8279d49ee07b49
Merge: 40ef985 9d08574
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Sat Sep 7 16:54:19 2013 +0200
Imported Debian patch 22.2+git20130830~92d25d6-1
.gitignore | 6 -
common/src/main/java/com/android/SdkConstants.java | 131 +++++++--
.../main/java/com/android/utils}/ArrayUtils.java | 2 +-
.../main/java/com/android/utils/HtmlBuilder.java | 309 +++++++++++++++++++++
.../main/java/com/android/utils}/SparseArray.java | 2 +-
.../java/com/android/utils}/SparseIntArray.java | 2 +-
.../main/java/com/android/xml/AndroidManifest.java | 27 ++
ddmlib/.settings/org.eclipse.jdt.core.prefs | 6 +-
.../main/java/com/android/ddmlib/AdbHelper.java | 38 ++-
.../src/main/java/com/android/ddmlib/Client.java | 73 +++--
.../main/java/com/android/ddmlib/ClientData.java | 12 +-
.../src/main/java/com/android/ddmlib/Device.java | 9 +
.../java/com/android/ddmlib/HandleProfiling.java | 56 +++-
.../src/main/java/com/android/ddmlib/IDevice.java | 49 +---
.../com/android/ddmlib/IShellEnabledDevice.java | 65 +++++
.../com/android/ddmlib/NativeAllocationInfo.java | 41 +--
.../java/com/android/ddmlib/TimeoutException.java | 15 +
.../testrunner/IRemoteAndroidTestRunner.java | 15 +-
.../ddmlib/testrunner/RemoteAndroidTestRunner.java | 31 ++-
ddms/app/.settings/org.eclipse.jdt.core.prefs | 6 +-
ddms/app/ddms.iml | 18 ++
ddms/app/etc/ddms.bat | 18 +-
.../src/main/java/com/android/ddms/UIThread.java | 5 +-
ddms/ddmuilib/.settings/org.eclipse.jdt.core.prefs | 6 +-
ddms/ddmuilib/ddmuilib.iml | 22 ++
.../java/com/android/ddmuilib/DevicePanel.java | 57 +++-
.../java/com/android/ddmuilib/SysinfoPanel.java | 135 +++++----
.../ddmuilib/heap/NativeDiffAllocationInfo.java | 67 +++++
.../ddmuilib/heap/NativeHeapDiffSnapshot.java | 39 ++-
.../com/android/ddmuilib/heap/NativeHeapPanel.java | 49 ++--
.../ddmuilib/heap/NativeHeapProviderByLibrary.java | 3 +
.../ddmuilib/heap/NativeSymbolResolverTask.java | 8 +-
.../ddmuilib/vmtrace/VmTraceOptionsDialog.java | 145 ++++++++++
debian/changelog | 10 +-
debian/compat | 2 +-
debian/control | 48 ++--
debian/copyright | 2 +-
debian/orig-tar.sh | 2 +-
debian/traceview.pod | 2 +-
debian/uiautomatorviewer.pod | 2 +-
.../app/.settings/org.eclipse.jdt.core.prefs | 6 +-
hierarchyviewer2/app/etc/hierarchyviewer.bat | 18 +-
.../.settings/org.eclipse.jdt.core.prefs | 6 +-
.../device/DeviceConnection.java | 9 +-
sdklib/.settings/org.eclipse.jdt.core.prefs | 6 +-
.../sdkuilib/.settings/org.eclipse.jdt.core.prefs | 6 +-
sdkmanager/sdkuilib/sdkuilib.iml | 20 ++
.../repository/core/PackagesDiffLogic.java | 2 +-
.../internal/repository/icons/accept_icon16.png | Bin 253 -> 3277 bytes
.../internal/repository/icons/addon_pkg_16.png | Bin 539 -> 529 bytes
.../internal/repository/icons/buildtool_pkg_16.png | Bin 453 -> 425 bytes
.../repository/icons/devman_generic_16.png | Bin 269 -> 2906 bytes
.../repository/icons/devman_manufacturer_16.png | Bin 269 -> 2906 bytes
.../internal/repository/icons/devman_user_16.png | Bin 269 -> 272 bytes
.../internal/repository/icons/doc_pkg_16.png | Bin 296 -> 290 bytes
.../internal/repository/icons/extra_pkg_16.png | Bin 428 -> 540 bytes
.../internal/repository/icons/log_off_16.png | Bin 236 -> 1218 bytes
.../internal/repository/icons/log_on_16.png | Bin 311 -> 468 bytes
.../internal/repository/icons/pkg_incompat_16.png | Bin 454 -> 409 bytes
.../internal/repository/icons/pkg_installed_16.png | Bin 356 -> 563 bytes
.../internal/repository/icons/pkg_new_16.png | Bin 299 -> 262 bytes
.../internal/repository/icons/pkg_update_16.png | Bin 296 -> 553 bytes
.../internal/repository/icons/pkgcat_16.png | Bin 388 -> 1352 bytes
.../internal/repository/icons/platform_pkg_16.png | Bin 460 -> 2981 bytes
.../repository/icons/platformtool_pkg_16.png | Bin 453 -> 393 bytes
.../internal/repository/icons/reject_icon16.png | Bin 317 -> 3367 bytes
.../internal/repository/icons/sample_pkg_16.png | Bin 433 -> 3188 bytes
.../internal/repository/icons/source_pkg_16.png | Bin 234 -> 466 bytes
.../internal/repository/icons/status_ok_16.png | Bin 264 -> 3277 bytes
.../internal/repository/icons/stop_disabled_16.png | Bin 321 -> 809 bytes
.../internal/repository/icons/stop_enabled_16.png | Bin 327 -> 642 bytes
.../internal/repository/icons/sysimg_pkg_16.png | Bin 485 -> 1145 bytes
.../internal/repository/icons/tool_pkg_16.png | Bin 188 -> 393 bytes
.../internal/repository/icons/unknown_icon16.png | Bin 265 -> 453 bytes
.../internal/widgets/AvdCreationDialog.java | 116 +++++---
.../repository/ui/MockPackagesPageImpl.java | 2 +-
.../repository/ui/SdkManagerUpgradeTest.java | 10 +-
sdkstats/.settings/org.eclipse.jdt.core.prefs | 6 +-
sdkstats/sdkstats.iml | 19 ++
swtmenubar/.settings/README.txt | 2 +
.../.settings/org.eclipse.jdt.core.prefs | 6 +-
swtmenubar/swtmenubar.iml | 17 ++
traceview/.classpath | 2 +-
traceview/.settings/org.eclipse.jdt.core.prefs | 6 +-
traceview/etc/traceview.bat | 18 +-
traceview/traceview.iml | 19 ++
.../.settings/org.eclipse.jdt.core.prefs | 6 +-
uiautomatorviewer/etc/uiautomatorviewer.bat | 18 +-
88 files changed, 1482 insertions(+), 373 deletions(-)
diff --cc debian/changelog
index 702d392,0000000..b15696c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,13 @@@
- androidsdk-tools (22+git20130416~f55ffbb-1) UNRELEASED; urgency=low
++androidsdk-tools (22.2+git20130830~92d25d6-1) unstable; urgency=low
++
++ * New upstream release.
++ * Remove non-ASCII characters from d/*.pod
++ - fixes FTBFS with perl 5.18.
++
++ -- Jakub Adam <jakub.adam at ktknet.cz> Sat, 07 Sep 2013 16:54:19 +0200
++
++androidsdk-tools (22+git20130416~f55ffbb-1) unstable; urgency=low
+
+ * Initial release (Closes: #687057).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz> Fri, 15 Mar 2013 08:08:59 +0100
diff --cc debian/compat
index 62f9457,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 6
++9
diff --cc debian/control
index 028c781,0000000..132538e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,143 -1,0 +1,143 @@@
+Source: androidsdk-tools
+Section: devel
+Priority: extra
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Stefan Handschuh <handschuh.stefan at googlemail.com>,
+ Jakub Adam <jakub.adam at ktknet.cz>
- Build-Depends: debhelper (>=9), javahelper, default-jdk, cdbs, bnd, libswt-gtk-3-java,
- libjfreechart-swt-java, eclipse-rcp (>= 3.8.1), libguava-java (>= 13.0.1),
- libkxml2-java
++Build-Depends: debhelper (>=9), cdbs, javahelper
++Build-Depends-Indep: default-jdk, bnd, libswt-gtk-3-java, libjfreechart-swt-java,
++ eclipse-rcp (>= 3.8.1), libguava-java (>= 13.0.1), libkxml2-java, perl
+Standards-Version: 3.9.4
+Homepage: http://developer.android.com/tools/help/index.html
- Vcs-Git: git://anonscm.debian.org/git/pkg-java/androidsdk-tools.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/androidsdk-tools.git
++Vcs-Git: git://anonscm.debian.org/pkg-java/androidsdk-tools.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/androidsdk-tools.git;a=summary
+
+Package: libandroidsdk-common-java
+Section: java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Description: Android sdk tools common library
+ Common library used by other android sdk tools.
+
+Package: libandroidsdk-sdklib-java
+Section: java
+Architecture: all
+Depends: libandroidsdk-common-java (= ${binary:Version}),
+ ${java:Depends}, ${misc:Depends}
- Description: Android sdklib
- The android sdklib contains the resource assembler that compiles
- the static resource files of an android project.
++Description: Android SDKlib
++ The Android SDKlib contains the resource assembler that compiles
++ the static resource files of an Android project.
+ .
- This version of the sdklib library lacks the support for the sdk manager.
++ This version of the SDKlib library lacks the support for the SDK manager.
+
+Package: libandroidsdk-sdkstats-java
+Section: java
+Architecture: all
+Depends: libandroidsdk-common-java (= ${binary:Version}),
+ ${java:Depends}, ${misc:Depends}
+Description: Sends Android SDK usage statistics to Google
- This library sends reports about usage of Android SDK to Google server.
- Information can be used to help improving the software.
++ This library sends reports about usage of the Android SDK to the
++ Google servers. Information can be used to help improving the
++ software.
+ .
- User has to grant a permission in order to participate in the data collection.
++ User has to grant permission in order to participate in the data collection.
+
+Package: libandroidsdk-swtmenubar-java
+Section: java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Description: Android SDK OS menubar hook library
+ This project provides a platform-specific way to hook into the default
+ OS menu bar.
+ .
+ Typically, an SWT Menu named "Tools" should be provided into which the
- library will add About and Options menu items.
++ library will add "About" and "Options" menu items.
+
+Package: libandroidsdk-ddmlib-java
+Section: java
+Architecture: all
+Depends: android-tools-adb, ${java:Depends}, ${misc:Depends}
+Description: Library for communicaton with connected Android devices
+ Dalvik Debug Monitor Server provides a way to communicate via adb with
+ Android devices connected through USB or running in emulator.
+
+Package: libandroidsdk-ddmuilib-java
+Section: java
+Architecture: all
+Depends: libandroidsdk-ddmlib-java (= ${binary:Version}),
+ ${java:Depends}, ${misc:Depends}
+Description: User interface library for ddmlib
+ Dalvik Debug Monitor Server provides a way to communicate via adb with
+ Android devices connected through USB or running in emulator.
+ .
+ This library provies UI components for use with ddmlib.
+
+Package: androidsdk-ddms
+Section: java
+Architecture: all
+Depends: libandroidsdk-swtmenubar-java (= ${binary:Version}),
+ libandroidsdk-ddmlib-java (= ${binary:Version}),
+ libandroidsdk-ddmuilib-java (= ${binary:Version}),
+ libandroidsdk-sdkstats-java (= ${binary:Version}),
+ ${java:Depends}, ${misc:Depends}
+Description: Graphical debugging tool for Android
+ Dalvik Debug Monitor is a tool for debugging Android applications. Among
+ others, it provides these capabilities:
+ .
- * Port-forwarding services.
- * Screen capture on the device.
- * Thread and heap information on the device.
- * Logcat, process, and radio state information.
- * Incoming call and SMS spoofing.
- * Location data spoofing.
++ * Port-forwarding services
++ * Screen capture on the device
++ * Thread and heap information on the device
++ * Logcat, process, and radio state information
++ * Incoming call and SMS spoofing
++ * Location data spoofing
+ .
- This package is required only when you want to run DDMS as a standalone
++ This package is required only when you want to run DDMS as a stand-alone
+ application. For usage from within Eclipse IDE, install eclipse-adt.
+
+Package: libandroidsdk-hierarchyviewerlib-java
+Section: java
+Architecture: all
+Depends: libandroidsdk-ddmuilib-java (= ${binary:Version}),
+ ${java:Depends}, ${misc:Depends}
+Description: Android Hierarchy Viewer library
+ Hierarchy Viewer allows you to debug and optimize your user interface.
- It provides a visual representation of the layout's View hierarchy
++ It provides a visual representation of the layout's view hierarchy
+ (the Layout View) and a magnified inspector of the display (the Pixel
+ Perfect View).
+
+Package: androidsdk-hierarchyviewer
+Section: java
+Architecture: all
+Depends: libandroidsdk-hierarchyviewerlib-java (= ${binary:Version}),
+ libandroidsdk-common-java (= ${binary:Version}),
+ libandroidsdk-swtmenubar-java (= ${binary:Version}),
+ ${java:Depends}, ${misc:Depends}
+Description: Tool to debug and optimize Android user interface
+ Hierarchy Viewer allows you to debug and optimize your user interface.
+ It provides a visual representation of the layout's View hierarchy
+ (the Layout View) and a magnified inspector of the display (the Pixel
+ Perfect View).
+ .
- This package is required only when you want to run DDMS as a standalone
- application. For usage from within Eclipse IDE, install eclipse-adt
++ This package is required only when you want to run DDMS as a stand-alone
++ application. For usage from within Eclipse IDE, install eclipse-adt.
+
+Package: androidsdk-traceview
+Section: java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Description: Tool to profile performance of Android applications
+ Traceview is a graphical viewer for execution logs saved by your application.
+ It can help you debug your application and profile its performance.
+
+Package: androidsdk-uiautomatorviewer
+Section: java
+Architecture: all
+Depends: libandroidsdk-common-java (= ${binary:Version}),
+ libandroidsdk-ddmlib-java (= ${binary:Version}),
+ ${java:Depends}, ${misc:Depends}
+Description: Tool to scan and analyze the UI components of an Android application
+ The uiautomatorviewer tool provides a convenient visual interface to inspect
+ the layout hierarchy and view the properties of the individual UI components
+ that are displayed on the test device. Using this information, you can later
+ create uiautomator tests with selector objects that target specific UI
+ components to test.
-
diff --cc debian/copyright
index 43723cd,0000000..2f43ca6
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,278 -1,0 +1,278 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
- Upstream-Name: Developement tools for the android SDK
++Upstream-Name: Development tools for the Android SDK
+Source: https://android.googlesource.com/platform/sdk
+
+Files: *
+Copyright: 2005-2013, The Android Open Source Project
+License: Apache-2.0
+
+Files: swtmenubar/*
+Copyright: 2011-2012, The Android Open Source Project
+License: EPL-1.0
+
+Files: debian/*
+Copyright: 2012, Stefan Handschuh <handschuh.stefan at googlemail.com>
+ 2012-2013, Jakub Adam <jakub.adam at ktknet.cz>
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: debian/ddms.pod
+ debian/hierarchyviewer.pod
+Copyright: 2013, www.linuxtopia.org
+ 2013, Jakub Adam <jakub.adam at ktknet.cz>
+License: Apache-2.0
+
+Files: debian/traceview.pod
+ debian/uiautomatorviewer.pod
+Copyright: 2013, www.linuxtopia.org
+ 2013, Jakub Adam <jakub.adam at ktknet.cz>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache License, Version 2.0
+ can be found in the file `/usr/share/common-licenses/Apache-2.0'.
+
+License: EPL-1.0
+ Eclipse Public License - v 1.0
+ .
+ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+ PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE
+ PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ .
+ 1. DEFINITIONS
+ .
+ "Contribution" means:
+ .
+ a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
+ .
+ i) changes to the Program, and
+ .
+ ii) additions to the Program;
+ .
+ where such changes and/or additions to the Program originate from and are
+ distributed by that particular Contributor. A Contribution 'originates'
+ from a Contributor if it was added to the Program by such Contributor itself
+ or anyone acting on such Contributor's behalf. Contributions do not include
+ additions to the Program which: (i) are separate modules of software
+ distributed in conjunction with the Program under their own license
+ agreement, and (ii) are not derivative works of the Program.
+ .
+ "Contributor" means any person or entity that distributes the Program.
+ .
+ "Licensed Patents " mean patent claims licensable by a Contributor which are
+ necessarily infringed by the use or sale of its Contribution alone or when
+ combined with the Program.
+ .
+ "Program" means the Contributions distributed in accordance with this
+ Agreement.
+ .
+ "Recipient" means anyone who receives the Program under this Agreement,
+ including all Contributors.
+ .
+ 2. GRANT OF RIGHTS
+ .
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly perform,
+ distribute and sublicense the Contribution of such Contributor, if any,
+ and such derivative works, in source code and object code form.
+ .
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of
+ the Contribution and the Program if, at the time the Contribution is added
+ by the Contributor, such addition of the Contribution causes such
+ combination to be covered by the Licensed Patents. The patent license shall
+ not apply to any other combinations which include the Contribution. No
+ hardware per se is licensed hereunder.
+ .
+ c) Recipient understands that although each Contributor grants the licenses
+ to its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other
+ intellectual property rights of any other entity. Each Contributor disclaims
+ any liability to Recipient for claims brought by any other entity based on
+ infringement of intellectual property rights or otherwise. As a condition to
+ exercising the rights and licenses granted hereunder, each Recipient hereby
+ assumes sole responsibility to secure any other intellectual property rights
+ needed, if any. For example, if a third party patent license is required to
+ allow Recipient to distribute the Program, it is Recipient's responsibility
+ to acquire that license before distributing the Program.
+ .
+ d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright license
+ set forth in this Agreement.
+ .
+ 3. REQUIREMENTS
+ .
+ A Contributor may choose to distribute the Program in object code form under
+ its own license agreement, provided that:
+ .
+ a) it complies with the terms and conditions of this Agreement; and
+ .
+ b) its license agreement:
+ .
+ i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of title
+ and non-infringement, and implied warranties or conditions of merchantability
+ and fitness for a particular purpose;
+ .
+ ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and consequential
+ damages, such as lost profits;
+ .
+ iii) states that any provisions which differ from this Agreement are offered
+ by that Contributor alone and not by any other party; and
+ .
+ iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable manner on
+ or through a medium customarily used for software exchange.
+ .
+ When the Program is made available in source code form:
+ .
+ a) it must be made available under this Agreement; and
+ .
+ b) a copy of this Agreement must be included with each copy of the Program.
+ .
+ Contributors may not remove or alter any copyright notices contained within
+ the Program.
+ .
+ Each Contributor must identify itself as the originator of its Contribution,
+ if any, in a manner that reasonably allows subsequent Recipients to identify
+ the originator of the Contribution.
+ .
+ 4. COMMERCIAL DISTRIBUTION
+ .
+ Commercial distributors of software may accept certain responsibilities with
+ respect to end users, business partners and the like. While this license is
+ intended to facilitate the commercial use of the Program, the Contributor who
+ includes the Program in a commercial product offering should do so in a manner
+ which does not create potential liability for other Contributors. Therefore,
+ if a Contributor includes the Program in a commercial product offering, such
+ Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+ every other Contributor ("Indemnified Contributor") against any losses,
+ damages and costs (collectively "Losses") arising from claims, lawsuits and
+ other legal actions brought by a third party against the Indemnified
+ Contributor to the extent caused by the acts or omissions of such Commercial
+ Contributor in connection with its distribution of the Program in a commercial
+ product offering. The obligations in this section do not apply to any claims
+ or Losses relating to any actual or alleged intellectual property
+ infringement. In order to qualify, an Indemnified Contributor must:
+ a) promptly notify the Commercial Contributor in writing of such claim, and
+ b) allow the Commercial Contributor to control, and cooperate with the
+ Commercial Contributor in, the defense and any related settlement
+ negotiations. The Indemnified Contributor may participate in any such claim
+ at its own expense.
+ .
+ For example, a Contributor might include the Program in a commercial product
+ offering, Product X. That Contributor is then a Commercial Contributor. If
+ that Commercial Contributor then makes performance claims, or offers
+ warranties related to Product X, those performance claims and warranties are
+ such Commercial Contributor's responsibility alone. Under this section, the
+ Commercial Contributor would have to defend claims against the other
+ Contributors related to those performance claims and warranties, and if a
+ court requires any other Contributor to pay any damages as a result, the
+ Commercial Contributor must pay those damages.
+ .
+ 5. NO WARRANTY
+ .
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON
+ AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+ EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
+ CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A
+ PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the
+ appropriateness of using and distributing the Program and assumes all
+ risks associated with its exercise of rights under this Agreement ,
+ including but not limited to the risks and costs of program errors,
+ compliance with applicable laws, damage to or loss of data, programs or
+ equipment, and unavailability or interruption of operations.
+ .
+ 6. DISCLAIMER OF LIABILITY
+ .
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+ CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+ LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+ EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. GENERAL
+ .
+ If any provision of this Agreement is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this Agreement, and without further action by
+ the parties hereto, such provision shall be reformed to the minimum extent
+ necessary to make such provision valid and enforceable.
+ .
+ If Recipient institutes patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+ (excluding combinations of the Program with other software or hardware)
+ infringes such Recipient's patent(s), then such Recipient's rights granted
+ under Section 2(b) shall terminate as of the date such litigation is filed.
+ .
+ All Recipient's rights under this Agreement shall terminate if it fails to
+ comply with any of the material terms or conditions of this Agreement and
+ does not cure such failure in a reasonable period of time after becoming
+ aware of such noncompliance. If all Recipient's rights under this Agreement
+ terminate, Recipient agrees to cease use and distribution of the Program as
+ soon as reasonably practicable. However, Recipient's obligations under this
+ Agreement and any licenses granted by Recipient relating to the Program
+ shall continue and survive.
+ .
+ Everyone is permitted to copy and distribute copies of this Agreement, but
+ in order to avoid inconsistency the Agreement is copyrighted and may only
+ be modified in the following manner. The Agreement Steward reserves the
+ right to publish new versions (including revisions) of this Agreement from
+ time to time. No one other than the Agreement Steward has the right to
+ modify this Agreement. The Eclipse Foundation is the initial Agreement
+ Steward. The Eclipse Foundation may assign the responsibility to serve as
+ the Agreement Steward to a suitable separate entity. Each new version of
+ the Agreement will be given a distinguishing version number. The Program
+ (including Contributions) may always be distributed subject to the version
+ of the Agreement under which it was received. In addition, after a new
+ version of the Agreement is published, Contributor may elect to distribute
+ the Program (including its Contributions) under the new version. Except as
+ expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+ rights or licenses to the intellectual property of any Contributor under
+ this Agreement, whether expressly, by implication, estoppel or otherwise.
+ All rights in the Program not expressly granted under this Agreement are
+ reserved.
+ .
+ This Agreement is governed by the laws of the State of New York and the
+ intellectual property laws of the United States of America. No party to
+ this Agreement will bring a legal action under this Agreement more than
+ one year after the cause of action arose. Each party waives its rights to
+ a jury trial in any resulting litigation.
diff --cc debian/orig-tar.sh
index fb786c3,0000000..df78231
mode 100755,000000..100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@@ -1,54 -1,0 +1,54 @@@
+#!/bin/bash
+
+#######################################################
+# This script fetches the latest commit of the branch #
+# with the specified revision. #
+#######################################################
+
+if [ -d androidsdk-tools -o -f androidsdk-tools ]
+then
+ echo "The file/directory 'androidsdk-tools' exists .. aborting."
+ exit
+fi
+
- REVISION=22
++REVISION=22.2
+
+git clone -b tools_r$REVISION https://android.googlesource.com/platform/tools/swt androidsdk-tools
+git clone -b tools_r$REVISION https://android.googlesource.com/platform/tools/base androidsdk-base
+
+# Merge sources into a single directory
+mv androidsdk-base/common androidsdk-base/sdklib androidsdk-base/ddmlib androidsdk-tools
+rm -fr androidsdk-base
+
+VERSION=`git --git-dir=androidsdk-tools/.git log -1 --format=%cd~%h --date=short | sed s/-//g`
+echo "Version "$VERSION
+echo "Deleting not needed files ..."
+rm -fr `find androidsdk-tools -maxdepth 1 -type d ! -name androidsdk-tools ! -name common ! -name sdklib ! -name sdkmanager ! -name sdkstats ! -name swtmenubar ! -name ddms ! -name ddmlib ! -name hierarchyviewer2 ! -name traceview ! -name uiautomatorviewer`
+rm -fr androidsdk-tools/common/src/test
+rm -fr androidsdk-tools/sdklib/src/test
+rm -fr androidsdk-tools/sdkstats/src/test
+rm -fr androidsdk-tools/ddms/src/test
+rm -fr androidsdk-tools/ddmlib/src/test
+rm -fr androidsdk-tools/sdkmanager/app
+rm -fr androidsdk-tools/sdkmanager/libs/sdkuilib
+rm -fr androidsdk-tools/ddms/ddmuilib/src/test
+rm -fr `find androidsdk-tools/sdklib/src/main/java/com/android/sdklib -maxdepth 1 ! -name sdklib ! -name build ! -name util ! -name internal`
+rm -fr `find androidsdk-tools/sdklib/src/main/java/com/android/sdklib/internal -type d ! -name internal ! -name build`
+rm -fr androidsdk-tools/sdklib/src/main/java/com/android/sdklib/build
+rm -fr androidsdk-tools/sdklib/src/main/java/com/android/sdklib/internal/build
+# rm -fr `find androidsdk-tools -name ".*"` # this might be too strict in some later versions
+rm -fr androidsdk-tools/sdkmanager/.gitignore
+rm -fr androidsdk-tools/sdkmanager/libs/sdklib/.settings
+rm -fr androidsdk-tools/sdkmanager/libs/sdklib/.classpath
+rm -fr androidsdk-tools/sdkmanager/libs/sdklib/.project
+rm -fr androidsdk-tools/common/.classpath
+rm -fr androidsdk-tools/common/.project
+rm -fr androidsdk-tools/common/.settings
+rm -fr androidsdk-tools/common/.gitignore
+rm -fr androidsdk-tools/.gitignore
+find androidsdk-tools -type f -name *gradle* -delete
+
+echo "Packaging archive into ../android-sdk-tools_$REVISION+git$VERSION.orig.tar.xz ..."
+tar -cJf ../androidsdk-tools_$REVISION+git$VERSION.orig.tar.xz androidsdk-tools
+echo "Deleting folder 'androidsdk-tools'"
+rm -Ir androidsdk-tools
diff --cc debian/traceview.pod
index 7476548,0000000..45677dc
mode 100644,000000..100644
--- a/debian/traceview.pod
+++ b/debian/traceview.pod
@@@ -1,259 -1,0 +1,259 @@@
+=head1 NAME
+
+traceview - a graphical viewer for execution logs saved by Android application.
+
+=head1 SYNOPSIS
+
+traceview [-r] trace
+
+=head1 DESCRIPTION
+
+Traceview is a graphical viewer for execution logs that you create by using the
+Debug class to log tracing information in your code. Traceview can help you
+debug your application and profile its performance.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-r>
+
+regression only
+
+=back
+
+=head1 TRACEVIEW LAYOUT
+
+When you have a trace log file (generated by adding tracing code to your
+application or by DDMS), you can have Traceview load the log files and display
+their data in a window visualizes your application in two panels:
+
+=over 4
+
+A timeline panel - describes when each thread and method started and stopped.
+
+A profile panel - provides a summary of what happened inside a method.
+
+=back
+
+The sections below provide addition information about the traceview output
+panes.
+
+=head2 Timeline Panel
+
- Each thread’s execution is shown in its own row, with time increasing to the
++Each thread's execution is shown in its own row, with time increasing to the
+right. Each method is shown in another color (colors are reused in a round-robin
+fashion starting with the methods that have the most inclusive time). The thin
+lines underneath the first row show the extent (entry to exit) of all the calls
+to the selected method. The method in this case is LoadListener.nativeFinished()
+and it was selected in the profile view.
+
+=head2 Profile Panel
+
+This view shows a summary of all the time spent in a method. The table shows
+both the inclusive and exclusive times (as well as the percentage of the total
+time). Exclusive time is the time spent in the method. Inclusive time is the
+time spent in the method plus the time spent in any called functions. We refer
+to calling methods as "parents" and called methods as "children." When a method
+is selected (by clicking on it), it expands to show the parents and children.
+Parents are shown with a purple background and children with a yellow
+background. The last column in the table shows the number of calls to this
+method plus the number of recursive calls. The last column shows the number of
+calls out of the total number of calls made to that method. In this view, we
+can see that there were 14 calls to LoadListener.nativeFinished(); looking at
+the timeline panel shows that one of those calls took an unusually long time.
+
+=head1 TRACEVIEW FILE FORMAT
+
+Tracing creates two distinct pieces of output: a data file, which holds the
+trace data, and a key file, which provides a mapping from binary identifiers to
+thread and method names. The files are concatenated when tracing completes, into
+a single .trace file.
+
+B<Note:> The previous version of Traceview did not concatenate these files for
+you. If you have old key and data files that you'd still like to trace, you can
+concatenate them yourself with cat mytrace.key mytrace.data > mytrace.trace.
+
+=head2 Data File Format
+
+The data file is binary, structured as follows (all values are stored in little
+endian order):
+
+ * File format:
+ * header
+ * record 0
+ * record 1
+ * ...
+ *
+ * Header format:
+ * u4 magic 0x574f4c53 ('SLOW')
+ * u2 version
+ * u2 offset to data
+ * u8 start date/time in usec
+ *
+ * Record format:
+ * u1 thread ID
+ * u4 method ID | method action
+ * u4 time delta since start, in usec
+
+The application is expected to parse all of the header fields, then seek to
+"offset to data" from the start of the file. From there it just reads 9-byte
+records until EOF is reached.
+
+u8 start date/time in usec is the output from gettimeofday(). It's mainly there
+so that you can tell if the output was generated yesterday or three months ago.
+
+method action sits in the two least-significant bits of the method word. The
+currently defined meanings are:
+
+ 0 - method entry
+ 1 - method exit
+ 2 - method "exited" when unrolled by exception handling
+ 3 - (reserved)
+
+An unsigned 32-bit integer can hold about 70 minutes of time in microseconds.
+
+=head2 Key File Format
+
+The key file is a plain text file divided into three sections. Each section
+starts with a keyword that begins with '*'. If you see a '*' at the start of
+a line, you have found the start of a new section.
+
+An example file might look like this:
+
+ *version
+ 1
+ clock=global
+ *threads
+ 1 main
+ 6 JDWP Handler
+ 5 Async GC
+ 4 Reference Handler
+ 3 Finalizer
+ 2 Signal Handler
+ *methods
+ 0x080f23f8 java/io/PrintStream write ([BII)V
+ 0x080f25d4 java/io/PrintStream print (Ljava/lang/String;)V
+ 0x080f27f4 java/io/PrintStream println (Ljava/lang/String;)V
+ 0x080da620 java/lang/RuntimeException <init> ()V
+ [...]
+ 0x080f630c android/os/Debug startMethodTracing ()V
+ 0x080f6350 android/os/Debug startMethodTracing (Ljava/lang/String;Ljava/lang/String;I)V
+ *end
+
+The following list describes the major sections of a key file:
+
+=over 4
+
+=item version section
+
+The first line is the file version number, currently 1. The second line,
+clock=global, indicates that we use a common clock across all threads. A future
+version may use per-thread CPU time counters that are independent for every
+thread.
+
+=item threads section
+
+One line per thread. Each line consists of two parts: the thread ID, followed by
+a tab, followed by the thread name. There are few restrictions on what a valid
+thread name is, so include everything to the end of the line.
+
+=item methods section
+
+One line per method entry or exit. A line consists of four pieces, separated by
+tab marks: method-ID [TAB] class-name [TAB] method-name [TAB] signature. Only
+the methods that were actually entered or exited are included in the list. Note
+that all three identifiers are required to uniquely identify a method.
+
+=back
+
+Neither the threads nor methods sections are sorted.
+
+=head1 CREATING TRACE FILES
+
+To use Traceview, you need to generate log files containing the trace
+information you want to analyze.
+
+There are two ways to generate trace logs:
+
+=over 4
+
+Include the Debug class in your code and call its methods to start and stop
+logging of trace information to disk. This method is very precise because you
+can specify in your code exactly where to start and stop logging trace data.
+
+Use the method profiling feature of DDMS to generate trace logs. This method is
+less precise since you do not modify code, but rather specify when to start and
+stop logging with a DDMS. Although you have less control on exactly where the
+data is logged, this method is useful if you don't have access to the
+application's code, or if you do not need the precision of the first method.
+
+=back
+
+Before you start generating trace logs, be aware of the following restrictions:
+
+=over 4
+
+If you are using the Debug class, your device or emulator must have an SD card
+and your application must have permission to write to the SD card.
+
+If you are using DDMS, Android 1.5 devices are not supported.
+
+If you are using DDMS, Android 2.1 and earlier devices must have an SD card
+present and your application must have permission to write to the SD card.
+
+If you are using DDMS, Android 2.2 and later devices do not need an SD card.
+The trace log files are streamed directly to your development machine.
+
+=back
+
+To create the trace files, include the Debug class and call one of the
+startMethodTracing() methods. In the call, you specify a base name for the
+trace files that the system generates. To stop tracing, call
+stopMethodTracing(). These methods start and stop method tracing across the
+entire virtual machine. For example, you could call startMethodTracing() in your
+activity's onCreate() method, and call stopMethodTracing() in that activity's
+onDestroy() method.
+
+ // start tracing to "/sdcard/calc.trace"
+ Debug.startMethodTracing("calc");
+ // ...
+ // stop tracing
+ Debug.stopMethodTracing();
+
+When your application calls startMethodTracing(), the system creates a file
+called <trace-base-name>.trace. This contains the binary method trace data and
+a mapping table with thread and method names.
+
+The system then begins buffering the generated trace data, until your
+application calls stopMethodTracing(), at which time it writes the buffered data
+to the output file. If the system reaches the maximum buffer size before
+stopMethodTracing() is called, the system stops tracing and sends a notification
+to the console.
+
+Interpreted code will run more slowly when profiling is enabled. Don't try to
+generate absolute timings from the profiler results (i.e. "function X takes 2.5
+seconds to run"). The times are only useful in relation to other profile output,
+so you can see if changes have made the code faster or slower.
+
+When using the Android emulator, you must specify an SD card when you create
+your AVD because the trace files are written to the SD card. Your application
+must have permission to write to the SD card as well.
+
+=head1 COPYING TRACE FILES TO A HOST MACHINE
+
+After your application has run and the system has created your trace files
+<trace-base-name>.trace on a device or emulator, you must copy those files to
+your development computer. You can use adb pull to copy the files. Here's an
+example that shows how to copy an example file, calc.trace, from the default
+location on the emulator to the /tmp directory on the emulator host machine:
+
+ adb pull /sdcard/calc.trace /tmp
+
+=head1 COPYRIGHT
+
+This manual page is licensed under the Apache License, Version 2.0.
+
+Copyright (C) 2013 Android Open Source Project
+
+Copyright (C) 2013 Jakub Adam <jakub.adam at ktknet.cz>
diff --cc debian/uiautomatorviewer.pod
index 37be0d2,0000000..654e98f
mode 100644,000000..100644
--- a/debian/uiautomatorviewer.pod
+++ b/debian/uiautomatorviewer.pod
@@@ -1,80 -1,0 +1,80 @@@
+=head1 NAME
+
+uiautomatorviewer - a GUI tool to scan and analyze the UI components of an
+Android application.
+
+=head1 SYNOPSIS
+
+uiautomatorviewer
+
+=head1 DESCRIPTION
+
+You can use the uiautomatorviewer tool to take a snapshot of the foreground UI
+screen on any Android device that is connected to your development machine. The
+uiautomatorviewer tool provides a convenient visual interface to inspect the
+layout hierarchy and view the properties of the individual UI components that
+are displayed on the test device. Using this information, you can later create
+uiautomator tests with selector objects that target specific UI components to
+test.
+
+To analyze the UI components of the application that you want to test:
+
+=over 3
+
+=item 1.
+
+Connect your Android device to your development machine.
+
+=item 2.
+
+Run the uiautomatorviewer tool.
+
+=item 3.
+
+To capture a screen for analysis, click the Device Screenshot button in the GUI
+of the uiautomatorviewer tool.
+
+B<Note:> If you have more than one device connected, specify the device for
+screen capture by setting the ANDROID_SERIAL environment variable:
+
+=over 4
+
+Find the serial numbers for your connected devices by running this command:
+
+$ adb devices
+
+Set the ANDROID_SERIAL environment variable to select the device to test:
+
+$ export ANDROID_SERIAL=<device serial number>
+
+If you are connected to only a single device, you do not need to set the
+ANDROID_SERIAL environment variable.
+
+=back
+
+=item 4.
+
+View the UI properties for your application:
+
+=over 4
+
+Hover over the snapshot in the left-hand panel to see the UI components
- identified by the uiautomatorviewer tool. You can view the component’s
++identified by the uiautomatorviewer tool. You can view the component's
+properties listed in the lower right-hand panel, and the layout hierarchy in
+the upper right-hand panel.
+
+Optionally, click on the Toggle NAF Nodes button to see UI components that are
+not accessible to the uiautomator testing framework. Only limited information
+may be available for these components.
+
+=back
+
+=back
+
+=head1 COPYRIGHT
+
+This manual page is licensed under the Apache License, Version 2.0.
+
+Copyright (C) 2013 Android Open Source Project
+
+Copyright (C) 2013 Jakub Adam <jakub.adam at ktknet.cz>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/androidsdk-tools.git
More information about the pkg-java-commits
mailing list