Age | Commit message (Collapse) | Author |
|
12132a97ff -s ours am: 128d7fe369 -s ours am: 4647e5eec2 -s ours am: 298744478e -s ours
am skip reason: Merged-In I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366 with SHA-1 069a69b988 is already in history
Original change: https://android-review.googlesource.com/c/platform/tools/swt/+/1847901
Change-Id: I54dd0481bb8deb954b308fbc85426e0566b527c3
|
|
12132a97ff -s ours am: 128d7fe369 -s ours am: 4647e5eec2 -s ours
am skip reason: Merged-In I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366 with SHA-1 069a69b988 is already in history
Original change: https://android-review.googlesource.com/c/platform/tools/swt/+/1847901
Change-Id: Ibebd92c8896d9cf695d16e9e48fe8c4cf67320e4
|
|
12132a97ff -s ours am: 128d7fe369 -s ours
am skip reason: Merged-In I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366 with SHA-1 069a69b988 is already in history
Original change: https://android-review.googlesource.com/c/platform/tools/swt/+/1847901
Change-Id: I8adee6802de457e44d873bbd33b175834ac2624a
|
|
12132a97ff -s ours
am skip reason: Merged-In I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366 with SHA-1 069a69b988 is already in history
Original change: https://android-review.googlesource.com/c/platform/tools/swt/+/1847901
Change-Id: Ida6de2214b838e304e204338fe337ab269bb3de1
|
|
am skip reason: Merged-In I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366 with SHA-1 069a69b988 is already in history
Original change: https://android-review.googlesource.com/c/platform/tools/swt/+/1847901
Change-Id: Ica2c4c5455668094db5000b539d40e90371a6d00
|
|
|
|
Bug: 202323961
Merged-In: I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366
Change-Id: Id92058a96422f8e59b3f5d2c2d645d83912fb6cd
|
|
069a69b988 -s ours am: 354083d898 -s ours am: 0be54aa2e6 -s ours am: 09d18e7b36 -s ours
am skip reason: Merged-In Ie1a8c72faa378d7643b6c1d43928d83c9d740a6b with SHA-1 fcf093ee0c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/swt/+/15567340
Change-Id: Ibf5441cf5a8ca8e402b0daa8f70c41da2929bd13
|
|
069a69b988 -s ours am: 354083d898 -s ours am: 0be54aa2e6 -s ours
am skip reason: Merged-In Ie1a8c72faa378d7643b6c1d43928d83c9d740a6b with SHA-1 fcf093ee0c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/swt/+/15567340
Change-Id: I907cc91bc6adf878396b05705f59662fc674b702
|
|
069a69b988 -s ours am: 354083d898 -s ours
am skip reason: Merged-In Ie1a8c72faa378d7643b6c1d43928d83c9d740a6b with SHA-1 fcf093ee0c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/swt/+/15567340
Change-Id: Ia0d8f3901e3116b8640a419c160fbabf25491cb9
|
|
069a69b988 -s ours
am skip reason: Merged-In Ie1a8c72faa378d7643b6c1d43928d83c9d740a6b with SHA-1 fcf093ee0c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/swt/+/15567340
Change-Id: I8a2d07dacdc1522689e02701d17e110f7eb8a41e
|
|
Merged-In: Ie1a8c72faa378d7643b6c1d43928d83c9d740a6b
Change-Id: I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366
|
|
Bug: 68860345
Bug: 69058154
Bug: 151953481
Test: no code changes
Change-Id: Ie1a8c72faa378d7643b6c1d43928d83c9d740a6b
|
|
automerge: a688ec4
* commit 'a688ec4f3b6c1470694405f60cf4cad63e7d179b':
Android.bat: Quoted copy args
|
|
automerge: 9a8e16c
* commit '9a8e16ce66773a872377abdd6dea0067f79d3d34':
Android.bat: Quoted copy args
|
|
|
|
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
|
|
into studio-1.4-dev automerge: 98c9983
automerge: 43e189a
* commit '43e189a47b675a0898163746a3649895f17ac70b':
Quote xcopy arguments to fix "Invalid number of parameters" error
|
|
into studio-1.4-dev
automerge: 98c9983
* commit '98c998386e34d956b4ab6ab92b313039cb522f93':
Quote xcopy arguments to fix "Invalid number of parameters" error
|
|
into studio-1.4-dev
|
|
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
|
|
automerge: f48582b
automerge: 9b5e325
* commit '9b5e3253ff1732f76e4f1a53b4c591b2d0a6af69':
Add load base to relative pcs computed.
|
|
automerge: f48582b
* commit 'f48582b1ddfe2db038042e6ec82d87dd391d5be5':
Add load base to relative pcs computed.
|
|
|
|
The dynamic linker now supports relocation packing which changes
the relative offset of values into a map. When the raw pc values
are being decoded, the load base needs to be read from the shared
library and added to the relative pc that is computed.
Bug: 22565486
Change-Id: Id01c4753c2a2d7d5079b31554b95db1aa70965a5
|
|
automerge: 6645bc5
* commit '6645bc56799790c3f5f07f7e63d755a9759b0084':
Fix SdkManagerTest2.
|
|
automerge: ee339ab
* commit 'ee339ab83840bf564a43d87ff1754f247f2190fb':
Fix SdkManagerTest2.
|
|
|
|
Was broken by addition of wear_round_chin.
Change-Id: I6eac890eb970628d4a58cb8c03c0d356db169ade
|
|
automerge: a0e4c2f
* commit 'a0e4c2fe3a654739ab291bb97db59d67648c104e':
Fixing test broken by 159303
|
|
automerge: 6697162
* commit '6697162c5531bbc89866c9606b92031ae5cb5254':
Fixing test broken by 159303
|
|
|
|
See https://android-review.googlesource.com/159303
Change-Id: Ic33ba88e3750376619f57399fe50f36541ac8541
|
|
studio-1.3-dev automerge: 3603c66
automerge: c63bc48
* commit 'c63bc4825fa517483698194dab055b4c012983c7':
Update SdkManagerUpgradeTest to be aware of repo-11.xml
|
|
studio-1.3-dev
automerge: 3603c66
* commit '3603c66812eb0413b9044d29abafc7b60683a926':
Update SdkManagerUpgradeTest to be aware of repo-11.xml
|
|
studio-1.3-dev
|
|
Change-Id: I39df0ad34b6cc8c8b80b3fd976cc714ab147d419
|
|
studio-1.3-dev automerge: bf6ce10
automerge: e3ce426
* commit 'e3ce4265d2672616266f28d7f8a908e3f2b00c52':
Fix test that assumed that previews were disabled by default
|
|
studio-1.3-dev
automerge: bf6ce10
* commit 'bf6ce10b3aba4b08bfcf390588d4ee12e5b501a5':
Fix test that assumed that previews were disabled by default
|
|
studio-1.3-dev
|
|
Change-Id: I7d6578914b2d32b65599921dba40b064ba3770ee
|
|
studio-1.3-dev automerge: db246e2
automerge: 1e5e955
* commit '1e5e955e3612cea0f29cf935bd28b00e74d0f0aa':
android.bat: copy gson.jar to tmp folder while running
|
|
studio-1.3-dev
automerge: db246e2
* commit 'db246e2a0579b9169319d074d2104c4c156337af':
android.bat: copy gson.jar to tmp folder while running
|
|
studio-1.3-dev
|
|
gson is now a dependency required by sdkmanager
Change-Id: I053fdfce227345581bde400ef232e2b665a001f9
|
|
automerge: 6bc9e0f
automerge: 11ef4e0
* commit '11ef4e013b424e358f4d9e85bef7a88ad2ecf273':
Fix gson dependency in IDEA project files.
|
|
automerge: 6bc9e0f
* commit '6bc9e0f21000703a8a3e231da9eda6415bdc9409':
Fix gson dependency in IDEA project files.
|
|
|
|
Change-Id: Iadb5ab0988b3c79b026f843d41fd744faf47a9c1
|
|
automerge: 77ed70a
* commit '77ed70ae31789949100bc7c556192b99714b3faa':
Add gson library
|