Commit Graph

29810 Commits

Author SHA1 Message Date
Treehugger Robot
94af362628 Merge "Bump platform-tools version number" am: f3a4f3f966 am: 585e33ba5c
Original change: https://android-review.googlesource.com/c/platform/development/+/1647232

Change-Id: I5f23c01a1ece86e57e9af5f5cba4df6b2022a7cc
2021-03-20 08:21:34 +00:00
Treehugger Robot
585e33ba5c Merge "Bump platform-tools version number" am: f3a4f3f966
Original change: https://android-review.googlesource.com/c/platform/development/+/1647232

Change-Id: Iaa61ead7d3dacd61d291dd8ee5fd6bf7406345a3
2021-03-20 07:35:37 +00:00
Treehugger Robot
f3a4f3f966 Merge "Bump platform-tools version number" 2021-03-20 07:10:37 +00:00
Treehugger Robot
ff0212e7ae Merge "[cargo2android.py] Reserve all lines before the first rust_* rule" am: dccb72a1a2 am: c974998cba
Original change: https://android-review.googlesource.com/c/platform/development/+/1645771

Change-Id: Id9ee1a0a8553b8ba6b8871e34b1a416d6d67542e
2021-03-20 00:45:38 +00:00
Treehugger Robot
c974998cba Merge "[cargo2android.py] Reserve all lines before the first rust_* rule" am: dccb72a1a2
Original change: https://android-review.googlesource.com/c/platform/development/+/1645771

Change-Id: I2c33710466a36434b2e07c8f7bb1cf36609e620b
2021-03-20 00:03:14 +00:00
Treehugger Robot
dccb72a1a2 Merge "[cargo2android.py] Reserve all lines before the first rust_* rule" 2021-03-19 23:38:16 +00:00
Raju Kulkarni
d05c21bfd3 Bump platform-tools version number
Bug: 183233790
Test: N/A
Change-Id: Ib24c3b593102fb6c5b4f76cb6d9b106778fe8b95
2021-03-19 22:42:00 +00:00
Haibo Huang
0f72c95e70 [cargo2android.py] Reserve all lines before the first rust_* rule
Change-Id: Ic3cffcc7f34d878b7cc627f10361d42271b12f1e
2021-03-19 15:17:42 -07:00
Dan Albert
49a88d3754 Create out dir if it does not exist.
Test: ./build_ndk_docs.py
Bug: None
Change-Id: I47a31b42df4bf555c95f5abde2b0c86e64a32d57
2021-03-19 13:49:27 -07:00
Treehugger Robot
4113ffa98e Merge "Revert "Define some symlinks for workaround solutions"" am: b1e828448a am: 36f412b2bc
Original change: https://android-review.googlesource.com/c/platform/development/+/1647008

Change-Id: Ibf7f3e8a60b650bc077f9326729aa3bc927b4503
2021-03-19 09:02:48 +00:00
Treehugger Robot
36f412b2bc Merge "Revert "Define some symlinks for workaround solutions"" am: b1e828448a
Original change: https://android-review.googlesource.com/c/platform/development/+/1647008

Change-Id: Ibcf9adfe591c66b1401cd17b31830909c01cbf43
2021-03-19 08:42:27 +00:00
Treehugger Robot
b1e828448a Merge "Revert "Define some symlinks for workaround solutions"" 2021-03-19 08:15:57 +00:00
SzuWei Lin
70743f3355 Revert "Define some symlinks for workaround solutions"
This reverts commit 18f2cb7506.

Reason for revert: Workaround reason is gone.

Change-Id: I3c8217c6d6063dfd5ff39ba6e263e10bd4c21e40
2021-03-19 07:03:49 +00:00
Pirama Arumuga Nainar
b4c4fb9b81 Merge "Use clang-r412851" am: db1507471c am: 2b59657cbe
Original change: https://android-review.googlesource.com/c/platform/development/+/1597159

Change-Id: Iebc09bf04520111faca6aee66d43b9a5f95e46b4
2021-03-18 04:28:55 +00:00
Pirama Arumuga Nainar
2b59657cbe Merge "Use clang-r412851" am: db1507471c
Original change: https://android-review.googlesource.com/c/platform/development/+/1597159

Change-Id: Id0e5f07c71e2e8e45021d9c83698e61f5fce75f4
2021-03-18 04:01:37 +00:00
Pirama Arumuga Nainar
db1507471c Merge "Use clang-r412851" 2021-03-18 03:34:38 +00:00
Treehugger Robot
8ddbb0e22c Merge "Define some symlinks for workaround solutions" am: 70e66b45ce am: b5556da974
Original change: https://android-review.googlesource.com/c/platform/development/+/1639901

Change-Id: If58c16593b1669f11ad2a3fb95badc7609b72e70
2021-03-16 11:45:11 +00:00
Treehugger Robot
b5556da974 Merge "Define some symlinks for workaround solutions" am: 70e66b45ce
Original change: https://android-review.googlesource.com/c/platform/development/+/1639901

Change-Id: I633e0a3c6c87a644795dc0d053cf6c866c8684a0
2021-03-16 11:06:27 +00:00
Treehugger Robot
70e66b45ce Merge "Define some symlinks for workaround solutions" 2021-03-16 10:35:55 +00:00
SzuWei Lin
18f2cb7506 Define some symlinks for workaround solutions
Bug: 181614552
Test: n/a
Change-Id: I6a63df5807ff8f4301f4091d63d9d221c7c81d3b
2021-03-16 17:24:25 +08:00
SzuWei Lin
cfca7e02d7 Merge "Add empty.mk" am: 6008e0ff3a am: e22e62c090
Original change: https://android-review.googlesource.com/c/platform/development/+/1635459

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idecf23d739732a8ccf3962b86d49d307f013a4bc
2021-03-15 12:13:27 +00:00
SzuWei Lin
e22e62c090 Merge "Add empty.mk" am: 6008e0ff3a
Original change: https://android-review.googlesource.com/c/platform/development/+/1635459

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a636084771d7e1839efd3798d9e3aaeefbad06a
2021-03-15 11:32:39 +00:00
SzuWei Lin
6008e0ff3a Merge "Add empty.mk" 2021-03-15 10:53:12 +00:00
SzuWei Lin
061d91766a Add empty.mk
Bug: 181614552
Test: n/a
Change-Id: Ib624af5b230d4627476e38e62ba8389e19d357da
2021-03-15 16:57:08 +08:00
Krzysztof Kosiński
895e424a4c Merge "Make the "stack" script work for device tests." am: ea6686f701 am: ff1bb6b5fe
Original change: https://android-review.googlesource.com/c/platform/development/+/1606479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaee9b8efb8bc9a54d0979169cca03bfb218a61cd
2021-03-12 06:08:57 +00:00
Krzysztof Kosiński
ff1bb6b5fe Merge "Make the "stack" script work for device tests." am: ea6686f701
Original change: https://android-review.googlesource.com/c/platform/development/+/1606479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9decdca40272066e107fbc095dfeb2bb546c9a7
2021-03-12 05:32:29 +00:00
Krzysztof Kosiński
ea6686f701 Merge "Make the "stack" script work for device tests." 2021-03-12 04:48:04 +00:00
Krzysztof Kosiński
dd45e18f94 Make the "stack" script work for device tests.
The path where the tests are uploaded by atest differs from the
path to unstripped binaries in the out directory. As a result,
the script can't symbolize the parts of the stack trace that
correspond to code in the test binary. Add a fixup to use the
correct path.

Test: Used the script on example crashes in framework and vendor
device tests - appears to work and give correct line numbers.

Change-Id: I5470e6342afb801ac596cbc0c0bf067850b1e09a
2021-03-11 18:09:15 -08:00
Haibo Huang
bfe5ddf508 Merge "[header-checker] Use new jsoncpp API" am: 1252a2c311 am: e4880a63a9
Original change: https://android-review.googlesource.com/c/platform/development/+/1627879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If957f046119cd15e706a0cb83039b32916953f30
2021-03-11 19:49:47 +00:00
Haibo Huang
e4880a63a9 Merge "[header-checker] Use new jsoncpp API" am: 1252a2c311
Original change: https://android-review.googlesource.com/c/platform/development/+/1627879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica4367fb44cfbf9ad7b32a7f9499792c299a65ca
2021-03-11 19:07:44 +00:00
Haibo Huang
1252a2c311 Merge "[header-checker] Use new jsoncpp API" 2021-03-11 18:26:15 +00:00
Haibo Huang
fd461baf2a [header-checker] Use new jsoncpp API
Reader / StyledWriter are deprecated upstream

Bug: 170642246
Change-Id: I1099e348693cc6021389f7e7f75e85f58e70b449
2021-03-11 07:06:56 +00:00
Hsin-Yi Chen
9e7d31bf8d Merge "Let blueprint.py skip searching Android.bp in out dir" am: 3ca6731998 am: abad4eb54f
Original change: https://android-review.googlesource.com/c/platform/development/+/1622665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c18f9efc97650b6bfa58cf6ef1066598c934376
2021-03-10 05:12:16 +00:00
Hsin-Yi Chen
abad4eb54f Merge "Let blueprint.py skip searching Android.bp in out dir" am: 3ca6731998
Original change: https://android-review.googlesource.com/c/platform/development/+/1622665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia16648362a0045818d26d3083663e74d89fffc08
2021-03-10 04:31:36 +00:00
Hsin-Yi Chen
3ca6731998 Merge "Let blueprint.py skip searching Android.bp in out dir" 2021-03-10 03:49:32 +00:00
Po Hu
7a3de33e2a Let blueprint.py skip searching Android.bp in out dir
Use a general rule to identify out dir instead of hard code name.

Bug: 182193244
Change-Id: Ib7b669162dee86e7815066cc95ca9e84e2db17be
2021-03-09 12:42:13 +08:00
Josh Gao
959148b45e Merge "Increment platform-tools version to 31.0.1." am: c3043eaa4b am: 1d215a4530
Original change: https://android-review.googlesource.com/c/platform/development/+/1612365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebdd685d838ed410fa33f777ac916ba482e8a69e
2021-03-03 01:34:15 +00:00
Josh Gao
1d215a4530 Merge "Increment platform-tools version to 31.0.1." am: c3043eaa4b
Original change: https://android-review.googlesource.com/c/platform/development/+/1612365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic53bf8eb95cfd8b22f3c12b1a8b830fd5ea253cf
2021-03-03 00:54:02 +00:00
Josh Gao
c3043eaa4b Merge "Increment platform-tools version to 31.0.1." 2021-03-03 00:16:33 +00:00
Josh Gao
e0a2abb78e Increment platform-tools version to 31.0.1.
Test: none
Change-Id: Ie76bb225a859cd5cc99ac48b73ce68650e168d0d
2021-03-01 23:18:01 -08:00
Treehugger Robot
6510f92f46 Merge "Sort properties to ease comparison." am: 3dc563e396 am: c26b96f15a
Original change: https://android-review.googlesource.com/c/platform/development/+/1611255

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie68f8f19ca1713df4597b9e6e7bac6ad38dd401b
2021-03-01 09:41:44 +00:00
Treehugger Robot
c26b96f15a Merge "Sort properties to ease comparison." am: 3dc563e396
Original change: https://android-review.googlesource.com/c/platform/development/+/1611255

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6078c207807517dc3b1919f8adb60e5bd60d90f4
2021-03-01 09:02:48 +00:00
Treehugger Robot
3dc563e396 Merge "Sort properties to ease comparison." 2021-03-01 08:03:50 +00:00
Bill Peckham
e5f35b6f87 Sort properties to ease comparison.
You might want to compare generated Android.bp files
from different snapshots or different points in time on
the same snapshot. Sorting the properties makes this
easier.

Test: manually compare different Android.bp files
Change-Id: I68beea856620f14b879cbf3148cab62dd991a67b
2021-02-26 15:54:17 -08:00
Thiébaud Weksteen
e95d65a70c Merge "Update add3prf.py" am: 63076c657d am: c753ebcfdc
Original change: https://android-review.googlesource.com/c/platform/development/+/1595313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3d2fcf76ae5509f19f60792339f34d444343561
2021-02-23 12:55:42 +00:00
Thiébaud Weksteen
c753ebcfdc Merge "Update add3prf.py" am: 63076c657d
Original change: https://android-review.googlesource.com/c/platform/development/+/1595313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id39032e32d52913b91af669fe964682f827d1fe6
2021-02-23 12:05:35 +00:00
Thiébaud Weksteen
63076c657d Merge "Update add3prf.py" 2021-02-23 10:00:15 +00:00
Xin Li
f647bb160e [automerger skipped] Mark ab/7061308 as merged in stage. am: 6eec2c269d -s ours
am skip reason: Change-Id I3efdf9a5c98f5d0bf3607c2ae7e2a7ec22d922a6 with SHA-1 8a1baea811 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63165de8bf4edc8b6c8b9b855d3cc3fe75cdbad4
2021-02-20 09:52:07 +00:00
Xin Li
6eec2c269d Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: I3efdf9a5c98f5d0bf3607c2ae7e2a7ec22d922a6
Change-Id: Ie0b4636918a72aca13a671f8249fef12bd529d3d
2021-02-20 00:24:00 -08:00
Chih-Hung Hsieh
af6b5af521 Use clang-r412851
* Use new return type of getTypeInfoInChars.

Bug: 179065588
Test: repo checkout branch clang-tools; run
Test: OUT_DIR=out prebuilts/clang-tools/build-prebuilts.sh
Change-Id: I2cf7beb7223185ee9c05e4416ef703a3eb5767a5
2021-02-19 16:12:52 -08:00