Commit Graph

18335 Commits

Author SHA1 Message Date
Tor Norbye
28c210b844 Pass in current android.jar to api-generator
This ensures that the api-versions.xml shipped with
the SDK always includes the correct latest API
data (see http://b.android.com/183500)

(cherry picked from commit fbe6c8105a)

(cherry picked from commit 82336df0c1)

Change-Id: Ied1441430f023f7680ef4fe43e45eeda5162fa60
2015-10-15 09:03:14 -07:00
Josh Gao
d7f206d2b2 Merge "adb unittest: fix Windows Unicode" 2015-10-14 03:01:33 +00:00
Spencer Low
4160958015 adb unittest: fix Windows Unicode
adb.shell() was recently changed to use subprocess.Popen(), which
doesn't work properly with Unicode on Windows. The fix is to use the
same work-around that I did for subprocess.check_output(): write UTF-8
to a batch file and run it. The change is primarily refactoring to
enable code reuse.

Change-Id: I88e9b9b35e5318533c0cd932d92e13bc9e734092
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-10-13 19:51:30 -07:00
David Pursell
6d49cebd90 Merge "adb: fix docstring for shell functions." 2015-10-13 15:08:46 +00:00
David Pursell
45d61d070f adb: fix docstring for shell functions.
Change-Id: Iaae8605b18583c38e517f865083012204d236832
2015-10-12 15:55:38 -07:00
David Pursell
d427f1e5f5 Merge changes Ibe3db0be,I65e77f91
* changes:
  gdbclient.py: set PWD when querying makefiles.
  gdbclient.py: add gdb connect retry.
2015-10-06 17:16:29 +00:00
David Pursell
d1fe92f375 gdbclient.py: set PWD when querying makefiles.
Python's subprocess.check_output() cwd argument does not change the PWD
environmental variable, which is what dumpvar.mk uses to turn relative
paths into absolute paths. This led to incorrect symbol paths when
gdbclient was not run from the root directory.

This CL fixes the bug by manually setting PWD before calling the
makefile. It's possible that dumpvar.mk should be using a different
method to get the current directory, but I was scared to change any
core build logic and this approach seems to work just fine.

Change-Id: Ibe3db0bef6694934c512918f7562029313b1deae
2015-10-06 09:18:47 -07:00
David Pursell
320f881efe gdbclient.py: add gdb connect retry.
gdbclient.py can sometimes attempt to connect to the server before it's
ready, especially when debugging on an emulator. This CL adds
functionality to retry the connection for up to 5 seconds.

Bug: http://b/24671386
Change-Id: I65e77f918c3ea8433f992e67122cd48e3647c67b
2015-10-06 09:18:36 -07:00
Josh Gao
f57d35cae4 am f1b53b58: Merge "Make gdbclient.py work in directories other than the root."
* commit 'f1b53b587871a16d2f444a77ea7256e6f8778c7e':
  Make gdbclient.py work in directories other than the root.
2015-10-03 00:43:19 +00:00
Josh Gao
f1b53b5878 Merge "Make gdbclient.py work in directories other than the root." 2015-10-02 23:23:42 +00:00
Josh Gao
6382f1768a Make gdbclient.py work in directories other than the root.
Change-Id: I8e383052e15f41919c7107bf960092120d2c621c
2015-10-02 15:58:57 -07:00
Josh Gao
09fdebad45 am 9c2057ab: Merge "Add python reimplementation of gdbclient."
* commit '9c2057ab43eda5679906acde0329d82b8a942d50':
  Add python reimplementation of gdbclient.
2015-10-01 22:11:34 +00:00
Josh Gao
9c2057ab43 Merge "Add python reimplementation of gdbclient." 2015-10-01 21:31:39 +00:00
Josh Gao
043bad746f Add python reimplementation of gdbclient.
Bug: http://b/23715403
Bug: http://b/22946322
Bug: http://b/22946705
Bug: http://b/22120411
Bug: http://b/22715953
Change-Id: I2391ec03be8d2487a4738455b6e934874c7f595f
2015-10-01 14:30:29 -07:00
David Pursell
7d2519e10f am 07006ce7: Merge "adb: make shell protocol work again."
* commit '07006ce756c6bf8cff745ca85dafb89ebcba37f6':
  adb: make shell protocol work again.
2015-10-01 15:38:31 +00:00
David Pursell
07006ce756 Merge "adb: make shell protocol work again." 2015-10-01 15:34:29 +00:00
David Pursell
46e268e990 adb: make shell protocol work again.
http://r.android.com/173810 changed the shell feature name. This CL
updates the python scripts to re-enable shell protocol tests, and adds
an additional test for `adb shell -x`.

Change-Id: I961adf7abd1782ea98f3f82d8af11dcaa02f9570
2015-09-30 17:22:32 -07:00
Josh Gao
285bb8ddef am b9184809: Merge changes from topic \'gdbclient.py\'
* commit 'b9184809e7e3305d49a7a5a1c237538d9efec15a':
  Add gdbrunner package for shared functionality.
  Add get_props to adb.py's AndroidDevice.
  Add remount to adb.py's AndroidDevice.
  Add shell_popen method to adb.py.
  Add helper functions for `adb -e/-d` to adb.py.
2015-09-30 21:47:37 +00:00
Josh Gao
b9184809e7 Merge changes from topic 'gdbclient.py'
* changes:
  Add gdbrunner package for shared functionality.
  Add get_props to adb.py's AndroidDevice.
  Add remount to adb.py's AndroidDevice.
  Add shell_popen method to adb.py.
  Add helper functions for `adb -e/-d` to adb.py.
2015-09-30 21:39:32 +00:00
Josh Gao
75b0383747 Add gdbrunner package for shared functionality.
This deduplicates code between gdbclient.py and ndk-gdb.py.

Bug: http://b/23715403
Change-Id: I6ee61b466aaf3cde8f6b26b11bfa95761821cb6d
2015-09-30 14:36:35 -07:00
Josh Gao
87df6ff2c8 Add get_props to adb.py's AndroidDevice.
Saves adb shell roundtrips if multiple properties are needed.

Change-Id: I3a9fc0354b6eb0ee5389984e3f345c380404658c
2015-09-30 14:36:35 -07:00
Josh Gao
cac4e977bb Add remount to adb.py's AndroidDevice.
Change-Id: If1e17a49e81af840b76eab52db89bc9de09958fe
2015-09-30 14:36:35 -07:00
Josh Gao
21f984939b Add shell_popen method to adb.py.
This is mostly to allow backgrounding of processes run through adb
(gdbserver in particular).

Bug: http://b/23715403
Change-Id: I47fbebbd05d58044b4c447ffa86e0ab97d920278
2015-09-30 14:36:35 -07:00
Josh Gao
a8731c4be0 Add helper functions for adb -e/-d to adb.py.
Bug: http://b/22946322
Change-Id: I847f561d617b17f4e6323e0abb46dd270d041782
2015-09-30 14:36:35 -07:00
Baligh Uddin
b0ee90619e Import translations. DO NOT MERGE
Change-Id: Ieab33dfa47bf841f8cace05800a132f46f1c7541
Auto-generated-cl: translation import
2015-09-29 02:38:56 -07:00
Ying Wang
f2e32c0c9d am e4cded63: Merge "Substitue "/" with "-" in the MODULES-IN phony goal names."
* commit 'e4cded631dae5fb121891f3ff9a9d72075f21b0e':
  Substitue "/" with "-" in the MODULES-IN phony goal names.
2015-09-24 23:59:26 +00:00
Ying Wang
e4cded631d Merge "Substitue "/" with "-" in the MODULES-IN phony goal names." 2015-09-24 23:53:44 +00:00
Ying Wang
21d83c6817 Substitue "/" with "-" in the MODULES-IN phony goal names.
Bug: 24309760
Change-Id: I2372d0be0a811b11f3000646a2b7804e93852a84
2015-09-24 16:35:36 -07:00
Ying Wang
f797dc2b92 am 944edb56: Merge "Switch to the new mmma implementation using make goals."
* commit '944edb562b67bdf8e052bb292629afd365086df1':
  Switch to the new mmma implementation using make goals.
2015-09-24 02:15:42 +00:00
Ying Wang
944edb562b Merge "Switch to the new mmma implementation using make goals." 2015-09-24 01:20:18 +00:00
Ying Wang
1b06fea486 Switch to the new mmma implementation using make goals.
Bug: 24309760
Change-Id: Ia79bbdcd396bd5cadf3deac27cb121b9a816d465
2015-09-23 16:56:25 -07:00
David Pursell
ac2dfc346d am 54212f98: Merge "adb: fix install escaping test."
* commit '54212f988146578dd014c42a8b1e66e98ab740e7':
  adb: fix install escaping test.
2015-09-22 21:58:58 +00:00
David Pursell
54212f9881 Merge "adb: fix install escaping test." 2015-09-22 21:52:37 +00:00
David Pursell
9278d96e77 adb: fix install escaping test.
The install escaping test fails if the device supports exit codes. This
fixes the test to ignore the exit code since we expect the install to
fail.

Change-Id: I37bb39552a6e9068ac088a25d831f45d81b28155
2015-09-22 14:07:36 -07:00
David Pursell
14a29c0ea4 am 9f0ea756: Merge "adb: add tests for -Tt shell arguments."
* commit '9f0ea756e40e4f8dd7e0c2fe08cb56e7b4f8325a':
  adb: add tests for -Tt shell arguments.
2015-09-22 20:31:28 +00:00
David Pursell
9f0ea756e4 Merge "adb: add tests for -Tt shell arguments." 2015-09-22 20:23:57 +00:00
David Pursell
d89fcd4f76 adb: add tests for -Tt shell arguments.
Adds python tests to check that -T (disable PTY) and -t (force PTY)
arguments work as expected for `adb shell`.

Bug: http://b/23825231
Change-Id: I5343fae35b2be8459a9b95125f66def46c26adf4
2015-09-22 12:50:39 -07:00
Dan Albert
d95cc32a9b am b02c99f0: Merge "Move python-adb from system/core/adb."
* commit 'b02c99f08684749f1a9960db3a78e12597693407':
  Move python-adb from system/core/adb.
2015-09-21 17:34:32 +00:00
Dan Albert
b02c99f086 Merge "Move python-adb from system/core/adb." 2015-09-21 17:26:15 +00:00
Dan Albert
32e1307f45 Move python-adb from system/core/adb.
This really ought to be maintained as a separate project. Also adds a
setup.py for distribution.

Bug: http://b/22881740
Change-Id: I8e11e4154fac21d3196a533613822b236b2b73e6
2015-09-18 13:41:56 -07:00
Andreas Gampe
94cae1e977 am 1ba0c94c: Merge "Development/scripts: Update stack tool"
* commit '1ba0c94c685f95ce829c40240069c382e7b6f30f':
  Development/scripts: Update stack tool
2015-09-17 20:39:03 +00:00
Andreas Gampe
1ba0c94c68 Merge "Development/scripts: Update stack tool" 2015-09-17 20:28:30 +00:00
Andreas Gampe
57acd5f7da Development/scripts: Update stack tool
The tool was broken for ASAN traces. Add a missing key to the
dictionary.

Bug: 24133462
Change-Id: I6e5b60441c9c602cd1381c1cb32947a1425c7069
2015-09-17 11:44:21 -07:00
Yohann Roussel
03ae930a73 am 9e2e8392: Merge "Pick installed Jack & Jill for the sdk"
* commit '9e2e8392ae22051d775e093e6faba721d8b919eb':
  Pick installed Jack & Jill for the sdk
2015-09-15 07:38:40 +00:00
Yohann Roussel
9e2e8392ae Merge "Pick installed Jack & Jill for the sdk" 2015-09-15 07:31:54 +00:00
Siva Velusamy
a541aa6559 resolved conflicts for 3f9d7b08 to stage-aosp-master
Change-Id: I3857d3ebdece7db356adfbc9b4f2ff3b1fc25825
2015-09-14 17:14:28 -07:00
Siva Velusamy
3f9d7b0826 Merge "platform tools version: replace alpha1 with rc1" 2015-09-15 00:01:27 +00:00
Siva Velusamy
a22f08db3a platform tools version: replace alpha1 with rc1
The build scripts don't seem to accept alpha1 as the qualifier.
Earlier we've used rc1 so trying that.

Change-Id: I10c86fa2e727a840b8fdd16b3e7d3e311fb05831
2015-09-14 14:56:06 -07:00
Siva Velusamy
3ad4e29ac2 resolved conflicts for b1ead6e2 to stage-aosp-master
Change-Id: I86c4af2fece33e94cf7fd8f3301f05a3fcdb642e
2015-09-14 11:56:51 -07:00
Siva Velusamy
b1ead6e2de Merge "Update platform tools version to .1.0 alpha1" 2015-09-14 18:44:12 +00:00