Commit Graph

74016 Commits

Author SHA1 Message Date
Treehugger Robot
4e23cac241 Merge "Zipalign: Avoid unnecessary padding" am: 50ec71eac8
Original change: https://android-review.googlesource.com/c/platform/build/+/1826624

Change-Id: I4a5cfe56ff9fc6788934c059eb5c35d42d7da4a4
2021-09-15 00:49:00 +00:00
Guang Zhu
4fb3c32cc3 Merge "update build rules to use /data/local/tests/unrestricted" am: f934e69049 am: e3d9c8502c am: bcb487b2fa
Original change: https://android-review.googlesource.com/c/platform/build/+/1826138

Change-Id: I38fbe193470f4d9eb4c68b96e7d5514355129257
2021-09-15 00:48:58 +00:00
Guang Zhu
bcb487b2fa Merge "update build rules to use /data/local/tests/unrestricted" am: f934e69049 am: e3d9c8502c
Original change: https://android-review.googlesource.com/c/platform/build/+/1826138

Change-Id: I8a18bfb1e2e0262b8cd7ffa41115ac56f10c7a7e
2021-09-15 00:35:01 +00:00
Treehugger Robot
50ec71eac8 Merge "Zipalign: Avoid unnecessary padding" 2021-09-15 00:34:44 +00:00
Guang Zhu
e3d9c8502c Merge "update build rules to use /data/local/tests/unrestricted" am: f934e69049
Original change: https://android-review.googlesource.com/c/platform/build/+/1826138

Change-Id: I2dad026ec178ef4aac84edfcb909ceecb9e4935a
2021-09-15 00:23:31 +00:00
Guang Zhu
f934e69049 Merge "update build rules to use /data/local/tests/unrestricted" 2021-09-15 00:22:43 +00:00
Paul Scovanner
948f7fa552 Update Security String to 2021-11-05
Bug: 199784479
Change-Id: I93db0c1fa9fbf42223fa2be0d6859bb22d1abac4
2021-09-14 23:27:05 +00:00
Fabien Sanglard
df73d1b473 Zipalign: Avoid unnecessary padding
Problem: Aligned entry always get padded to the next aligned slot.
Solution: Fix alignment test.

Bug: 199932309
Test: align_test.cpp
Change-Id: I1e61c67dcf45454dd782d0fcc6903f7e71954083
2021-09-14 15:20:42 -07:00
Christopher Ferris
91cf50c753 Merge "Make the script python3." am: fe9efa5a61 am: 69dd474c35 am: f52cfa547f am: 164629ec00 am: 6ac9dcdccb
Original change: https://android-review.googlesource.com/c/platform/build/+/1822532

Change-Id: Ic004258c833f0a056dc6b0105362d6518c28c857
2021-09-14 22:14:21 +00:00
TreeHugger Robot
f12be447cd [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-dev-plus-aosp am: 2c3c8d5ab1 am: 5b79cdb61f -s ours am: dd16204e3e -s ours
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 9a9da6024c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15828153

Change-Id: I956047ee0de3b00090aff82e9066b4d9349c599e
2021-09-14 22:13:45 +00:00
Christopher Ferris
6ac9dcdccb Merge "Make the script python3." am: fe9efa5a61 am: 69dd474c35 am: f52cfa547f am: 164629ec00
Original change: https://android-review.googlesource.com/c/platform/build/+/1822532

Change-Id: Ie7dbdfa505c0fa5f480dfd3de9c20dcf8d998c61
2021-09-14 21:57:58 +00:00
TreeHugger Robot
dd16204e3e [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-dev-plus-aosp am: 2c3c8d5ab1 am: 5b79cdb61f -s ours
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 9a9da6024c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15828153

Change-Id: I076df41f1dc8052ce2e505aa2f730558eecdf50d
2021-09-14 21:57:47 +00:00
Christopher Ferris
164629ec00 Merge "Make the script python3." am: fe9efa5a61 am: 69dd474c35 am: f52cfa547f
Original change: https://android-review.googlesource.com/c/platform/build/+/1822532

Change-Id: I488cd6f539a2b8d83e0be14d75cdfe4fe50865f2
2021-09-14 21:43:53 +00:00
TreeHugger Robot
5b79cdb61f Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-dev-plus-aosp am: 2c3c8d5ab1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15828153

Change-Id: I439a40d055222206b9702850fa506c271206ef67
2021-09-14 21:43:44 +00:00
Christopher Ferris
f52cfa547f Merge "Make the script python3." am: fe9efa5a61 am: 69dd474c35
Original change: https://android-review.googlesource.com/c/platform/build/+/1822532

Change-Id: I1ad3fe09518934ade741f6e23bb72e410ffc2938
2021-09-14 21:35:00 +00:00
TreeHugger Robot
2c3c8d5ab1 Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-dev-plus-aosp 2021-09-14 21:30:59 +00:00
Christopher Ferris
69dd474c35 Merge "Make the script python3." am: fe9efa5a61
Original change: https://android-review.googlesource.com/c/platform/build/+/1822532

Change-Id: Ica119080b4482f30d74cc1402cfd8d7fb39fa10c
2021-09-14 21:25:55 +00:00
Christopher Ferris
fe9efa5a61 Merge "Make the script python3." 2021-09-14 21:03:01 +00:00
Greg Kaiser
c0ed306069 Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" am: d9c6d5fc91 am: 497e97a6d6 am: 641a518d8b am: 65661a59ab am: 42e4a4a73c
Original change: https://android-review.googlesource.com/c/platform/build/+/1826618

Change-Id: I8401527ea0b922415d453a026658daad8f095404
2021-09-14 20:53:24 +00:00
Greg Kaiser
42e4a4a73c Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" am: d9c6d5fc91 am: 497e97a6d6 am: 641a518d8b am: 65661a59ab
Original change: https://android-review.googlesource.com/c/platform/build/+/1826618

Change-Id: I0524130fd3420a29950e91296c87d75febc7f5d6
2021-09-14 20:40:04 +00:00
Greg Kaiser
65661a59ab Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" am: d9c6d5fc91 am: 497e97a6d6 am: 641a518d8b
Original change: https://android-review.googlesource.com/c/platform/build/+/1826618

Change-Id: I288a16b78984b7f3c14e2c2b6424ed96892b2b79
2021-09-14 20:28:45 +00:00
Greg Kaiser
641a518d8b Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" am: d9c6d5fc91 am: 497e97a6d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1826618

Change-Id: I2fa50640bc3c481261675dae3f7695761408b0fb
2021-09-14 20:14:13 +00:00
Greg Kaiser
497e97a6d6 Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" am: d9c6d5fc91
Original change: https://android-review.googlesource.com/c/platform/build/+/1826618

Change-Id: Iba7b9100c452202ddcf4529f6639568d44deff9f
2021-09-14 19:54:26 +00:00
Greg Kaiser
d9c6d5fc91 Merge "Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."" 2021-09-14 19:38:29 +00:00
Greg Kaiser
e086f7222e Revert "Rebuild vendor images in sign_target_files_apks with vendor otatools."
This reverts commit a1094e9f0c.

Reason for revert: Likely cause for b/199911935

Change-Id: Ib20400cc2f740a26fbbfb0da34fdf20ed7dc620e
2021-09-14 19:32:27 +00:00
Presubmit Automerger Backend
f09556406e [automerger skipped] [automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a am: 6fd648e189 -s ours am: 9cddbc712c -s ours am: 7f807238ef -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: Ie88069fecc00a10178d4e15861bf87ed891c9882
2021-09-14 18:40:12 +00:00
Presubmit Automerger Backend
292532a3ca [automerger skipped] [automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a am: 6fd648e189 -s ours am: 6ab0b9f15a -s ours am: dda365e643 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: If1768adbc9cbbcf2b504d04f73b5cfaadb865d59
2021-09-14 18:40:08 +00:00
Colin Cross
39798f6d21 [automerger skipped] Merge changes from topic "presubmit-am-603d217d511347a6a08cdbbc0ae5a67c" into sc-dev-plus-aosp am: 6185f37a09 -s ours am: 95d34f540e -s ours am: 315ad97f8e -s ours
am skip reason: Merged-In I3b7166d28df6d8828f895f839186de78592d259e with SHA-1 644348a687 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: I206f2a5fb9d7fd63f49b20b11caf2d0f40d757b2
2021-09-14 18:40:04 +00:00
Treehugger Robot
d837d63b05 Merge "Zipalign: Remove unused variables" am: c13f049bcd am: b4814708b5 am: 2bc7189b3f am: 4176827436 am: ea1efd9d18
Original change: https://android-review.googlesource.com/c/platform/build/+/1825936

Change-Id: I6b958b491111b7f40641ffd98209efe80177f847
2021-09-14 18:39:56 +00:00
Presubmit Automerger Backend
7f807238ef [automerger skipped] [automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a am: 6fd648e189 -s ours am: 9cddbc712c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: I16067ede27ab8fc09261c5714012dab7e6945829
2021-09-14 18:29:27 +00:00
Presubmit Automerger Backend
dda365e643 [automerger skipped] [automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a am: 6fd648e189 -s ours am: 6ab0b9f15a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: I419db3b40108608a77f3f18db148ef26d9b94ae2
2021-09-14 18:24:01 +00:00
Colin Cross
315ad97f8e [automerger skipped] Merge changes from topic "presubmit-am-603d217d511347a6a08cdbbc0ae5a67c" into sc-dev-plus-aosp am: 6185f37a09 -s ours am: 95d34f540e -s ours
am skip reason: Merged-In I3b7166d28df6d8828f895f839186de78592d259e with SHA-1 644348a687 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: I78cf8711afb33800c47f780d8cb3c600fa6ac243
2021-09-14 18:23:52 +00:00
Treehugger Robot
ea1efd9d18 Merge "Zipalign: Remove unused variables" am: c13f049bcd am: b4814708b5 am: 2bc7189b3f am: 4176827436
Original change: https://android-review.googlesource.com/c/platform/build/+/1825936

Change-Id: I47d3c9417d05d63a18d63fad4e7110e4d538544a
2021-09-14 18:23:48 +00:00
Presubmit Automerger Backend
9cddbc712c [automerger skipped] [automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a am: 6fd648e189 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: I949b94b0946ed3e02d02528e5d07acdd08b1273a
2021-09-14 18:14:10 +00:00
Presubmit Automerger Backend
6ab0b9f15a [automerger skipped] [automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a am: 6fd648e189 -s ours
am skip reason: Merged-In I3b7166d28df6d8828f895f839186de78592d259e with SHA-1 644348a687 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: Ia2b4b399121c288cc15029ec5ea9f75ac888639c
2021-09-14 18:14:05 +00:00
Colin Cross
95d34f540e [automerger skipped] Merge changes from topic "presubmit-am-603d217d511347a6a08cdbbc0ae5a67c" into sc-dev-plus-aosp am: 6185f37a09 -s ours
am skip reason: Merged-In I3b7166d28df6d8828f895f839186de78592d259e with SHA-1 644348a687 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15798253

Change-Id: I99799b12c8ec67b3bea9b62de70a411f2f60dfc6
2021-09-14 18:09:30 +00:00
Treehugger Robot
4176827436 Merge "Zipalign: Remove unused variables" am: c13f049bcd am: b4814708b5 am: 2bc7189b3f
Original change: https://android-review.googlesource.com/c/platform/build/+/1825936

Change-Id: I6613ffa914a9ec2db9e9fc5cd41b65b0441db66f
2021-09-14 18:09:24 +00:00
Guang Zhu
a736c45a95 update build rules to use /data/local/tests/unrestricted
... for native tests. This new location has the appropriate
settings for debuggerd to generate valid backtraces in case
of test binary crash.

Bug: 167308193
Bug: 199904562
Test: compile
Change-Id: Id727355ecc87415ba1e7ccc41ec55d2f6f5fc6f1
2021-09-14 10:58:14 -07:00
Colin Cross
6185f37a09 Merge changes from topic "presubmit-am-603d217d511347a6a08cdbbc0ae5a67c" into sc-dev-plus-aosp
* changes:
  [automerged blank] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a
  Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC""
2021-09-14 17:49:06 +00:00
Colin Cross
59b132d390 Merge changes from topic "presubmit-am-603d217d511347a6a08cdbbc0ae5a67c"
* changes:
  [automerged blank] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a 2p: 2fc40f70af
  [automerge] Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC"" 2p: ef1bcc1f9a
  Revert "Revert "RESTRICT AUTOMERGE Set BUILD_ID=SC""
2021-09-14 17:49:06 +00:00
Treehugger Robot
2bc7189b3f Merge "Zipalign: Remove unused variables" am: c13f049bcd am: b4814708b5
Original change: https://android-review.googlesource.com/c/platform/build/+/1825936

Change-Id: Id5f26d12fedbe323fda99c948494fe97c2a7aff1
2021-09-14 17:38:54 +00:00
Treehugger Robot
b4814708b5 Merge "Zipalign: Remove unused variables" am: c13f049bcd
Original change: https://android-review.googlesource.com/c/platform/build/+/1825936

Change-Id: I347fe33edae5cd5a055119c70532a3e78ebc12ff
2021-09-14 17:16:43 +00:00
Treehugger Robot
c13f049bcd Merge "Zipalign: Remove unused variables" 2021-09-14 16:52:29 +00:00
Rob Seymour
8439567b51 Merge "Add fake host snapshot support" am: ab5492c72c am: c3fc0a06e3 am: 08b1ec7e11 am: 1788a966be am: 22c44cdb09
Original change: https://android-review.googlesource.com/c/platform/build/+/1792747

Change-Id: I8365e65756df4f84bb805064cf9c0fe6ad2f4b3d
2021-09-14 16:08:23 +00:00
Rob Seymour
22c44cdb09 Merge "Add fake host snapshot support" am: ab5492c72c am: c3fc0a06e3 am: 08b1ec7e11 am: 1788a966be
Original change: https://android-review.googlesource.com/c/platform/build/+/1792747

Change-Id: If716436de8fc0ff577a187b1876dba2d2ecce79e
2021-09-14 15:53:24 +00:00
Sasha Smundak
1d7923e7d8 Move the stable code from version_defaults.mk to version_util.mk.
With version_defaults.mk containing only simple assignments, it can be
automatically converted to Starlark.
This is a cherrypick of ag/15768054

Bug: 198995713
Test: treehugger
Change-Id: I4798fb69c639e6d52d275a5b793fa0c8ba876202
Merged-In: I4798fb69c639e6d52d275a5b793fa0c8ba876202
2021-09-14 08:53:10 -07:00
Rob Seymour
1788a966be Merge "Add fake host snapshot support" am: ab5492c72c am: c3fc0a06e3 am: 08b1ec7e11
Original change: https://android-review.googlesource.com/c/platform/build/+/1792747

Change-Id: I79681d87ae253e4417d656501da5a42c4de9b06b
2021-09-14 15:40:17 +00:00
Rob Seymour
08b1ec7e11 Merge "Add fake host snapshot support" am: ab5492c72c am: c3fc0a06e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1792747

Change-Id: Ie413d857b5b2b6601700e2145132a369e062d19e
2021-09-14 15:28:48 +00:00
Rob Seymour
c3fc0a06e3 Merge "Add fake host snapshot support" am: ab5492c72c
Original change: https://android-review.googlesource.com/c/platform/build/+/1792747

Change-Id: I62a43d37ee667c0c899dd9647fa0117b30f075d2
2021-09-14 15:04:01 +00:00
Rob Seymour
ab5492c72c Merge "Add fake host snapshot support" 2021-09-14 14:47:03 +00:00