platform_tools_swt, branch android11-mainline-os-statsd-release Unnamed repository; edit this file 'description' to name the repository. Merge "Android.bat: Quoted copy args" into studio-1.4-dev automerge: 9a8e16c 2015-08-04T16:45:13+00:00 David Herman davidherman@google.com 2015-08-04T16:45:13+00:00 8996e71047a2bd11efee46ef14e02435ab5fa07a automerge: a688ec4 * commit 'a688ec4f3b6c1470694405f60cf4cad63e7d179b': Android.bat: Quoted copy args 
automerge: a688ec4

* commit 'a688ec4f3b6c1470694405f60cf4cad63e7d179b':
  Android.bat: Quoted copy args
Merge "Android.bat: Quoted copy args" into studio-1.4-dev 2015-08-04T16:43:36+00:00 David Herman davidherman@google.com 2015-08-04T16:43:36+00:00 a688ec4f3b6c1470694405f60cf4cad63e7d179b automerge: 9a8e16c * commit '9a8e16ce66773a872377abdd6dea0067f79d3d34': Android.bat: Quoted copy args 
automerge: 9a8e16c

* commit '9a8e16ce66773a872377abdd6dea0067f79d3d34':
  Android.bat: Quoted copy args
Merge "Android.bat: Quoted copy args" into studio-1.4-dev 2015-08-04T16:41:53+00:00 David Herman davidherman@google.com 2015-08-04T16:41:53+00:00 9a8e16ce66773a872377abdd6dea0067f79d3d34 






Android.bat: Quoted copy args
2015-08-04T16:41:06+00:00

David Herman
davidherman@google.com

2015-08-04T16:34:32+00:00

20e2f46588296c7047c5a6bb51fb19ac6d622089

Various directory args passed to copy contain a tmp_dir variable
which, depending on the user's machine, may have spaces. Quoting the
argument should protect against copy errors. It certainly doesn't
hurt anything.

Change-Id: I7db098b467daa0bfc2ad2e2e53b08257d0627dd9





Various directory args passed to copy contain a tmp_dir variable
which, depending on the user's machine, may have spaces. Quoting the
argument should protect against copy errors. It certainly doesn't
hurt anything.

Change-Id: I7db098b467daa0bfc2ad2e2e53b08257d0627dd9







Merge "Quote xcopy arguments to fix "Invalid number of parameters" error" into studio-1.4-dev automerge: 98c9983
2015-08-04T16:27:55+00:00

David Herman
davidherman@google.com

2015-08-04T16:27:55+00:00

d103bd9ac106eb97a1ee7ac946b4584eec95a8e8

automerge: 43e189a

* commit '43e189a47b675a0898163746a3649895f17ac70b':
  Quote xcopy arguments to fix "Invalid number of parameters" error





automerge: 43e189a

* commit '43e189a47b675a0898163746a3649895f17ac70b':
  Quote xcopy arguments to fix "Invalid number of parameters" error







Merge "Quote xcopy arguments to fix "Invalid number of parameters" error" into studio-1.4-dev
2015-08-04T16:26:18+00:00

David Herman
davidherman@google.com

2015-08-04T16:26:18+00:00

43e189a47b675a0898163746a3649895f17ac70b

automerge: 98c9983

* commit '98c998386e34d956b4ab6ab92b313039cb522f93':
  Quote xcopy arguments to fix "Invalid number of parameters" error





automerge: 98c9983

* commit '98c998386e34d956b4ab6ab92b313039cb522f93':
  Quote xcopy arguments to fix "Invalid number of parameters" error







Merge "Quote xcopy arguments to fix "Invalid number of parameters" error" into studio-1.4-dev
2015-08-04T16:25:02+00:00

David Herman
davidherman@google.com

2015-08-04T16:25:02+00:00

98c998386e34d956b4ab6ab92b313039cb522f93












Quote xcopy arguments to fix "Invalid number of parameters" error
2015-08-04T16:18:24+00:00

David Herman
davidherman@google.com

2015-08-04T16:18:24+00:00

b023211bab334e2243c80e459f2504ccb92ab9f2

On Windows, android.bat calls xcopy with %TEMP% as part of its
arguments. If android.bat is called from MSYS (like Git Bash) %TEMP%
contains forward slashes, confusing xcopy which is trying to take the
path as command line arguments. This causes the "Invalid number of
parameters" error message on the console. Fix this by quoting the path
arguments to xcopy.

Change-Id: I24b75b44610b539614ea42f26d702eb3da9514e6





On Windows, android.bat calls xcopy with %TEMP% as part of its
arguments. If android.bat is called from MSYS (like Git Bash) %TEMP%
contains forward slashes, confusing xcopy which is trying to take the
path as command line arguments. This causes the "Invalid number of
parameters" error message on the console. Fix this by quoting the path
arguments to xcopy.

Change-Id: I24b75b44610b539614ea42f26d702eb3da9514e6







Merge "Add load base to relative pcs computed." into studio-1.4-dev automerge: f48582b
2015-08-01T00:24:29+00:00

Christopher Ferris
cferris@google.com

2015-08-01T00:24:29+00:00

059b97955e180f5075ee1a3902f27e57f722f20e

automerge: 9b5e325

* commit '9b5e3253ff1732f76e4f1a53b4c591b2d0a6af69':
  Add load base to relative pcs computed.





automerge: 9b5e325

* commit '9b5e3253ff1732f76e4f1a53b4c591b2d0a6af69':
  Add load base to relative pcs computed.







Merge "Add load base to relative pcs computed." into studio-1.4-dev
2015-08-01T00:11:30+00:00

Christopher Ferris
cferris@google.com

2015-08-01T00:11:30+00:00

9b5e3253ff1732f76e4f1a53b4c591b2d0a6af69

automerge: f48582b

* commit 'f48582b1ddfe2db038042e6ec82d87dd391d5be5':
  Add load base to relative pcs computed.





automerge: f48582b

* commit 'f48582b1ddfe2db038042e6ec82d87dd391d5be5':
  Add load base to relative pcs computed.