Paul Scovanner
51b1e117c7
Update Security String to 2021-11-01 am: bdb63576ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15845733
Change-Id: Ie3653c7ae59538693a31536196c881903475fabb
2021-09-16 23:04:31 +00:00
Dan Willemsen
616e7fd9b6
Stop disting monolithic SDK for Mac SDK builds
...
The Mac SDK build is being reduced to just the build-tools and
platform-tools packages. I'm still working on refactoring those builds
not to require the monolithic SDK to be built first, but we can at least
stop distributing it (and other related files) now.
Most of these checks can likely go away once the build refactor is
complete, since we'll be able to move away from the `sdk` target to
something more specific. Right now there's a lot of logic around sdk
being in MAKECMDGOALS that I don't want to unravel with the current
build logic.
Bug: 187222815
Change-Id: I1f711ce063170e41078ad4a125bcd77340a1746c
2021-09-16 14:54:38 -07:00
David Anderson
778d7d1b43
Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f
am: cc21670121
am: 097b905051
am: 17e516372d
am: e371d2c902
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097
Change-Id: I14b96c83e1138dec9856682a94f4f6b25545c39d
2021-09-16 21:02:16 +00:00
David Anderson
e371d2c902
Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f
am: cc21670121
am: 097b905051
am: 17e516372d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097
Change-Id: I418fa535cd0c4b98c8adaefd686f72e4fddc6a3a
2021-09-16 20:48:14 +00:00
Treehugger Robot
40f03937b8
[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f
-s ours am: b476242ced
-s ours am: f0ea141e5d
-s ours am: e924552033
-s ours am: 42efaa14a6
-s ours
...
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1825152
Change-Id: I08f0a573e66ce3869885c179e928293ea3a101ab
2021-09-16 20:33:50 +00:00
David Anderson
17e516372d
Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f
am: cc21670121
am: 097b905051
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097
Change-Id: I84397899445b4a25dc345155b1144618ec8c83e3
2021-09-16 20:33:45 +00:00
David Anderson
097b905051
Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f
am: cc21670121
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097
Change-Id: I95f71747d3e54a321755017f98abb64327b14653
2021-09-16 20:12:21 +00:00
Treehugger Robot
42efaa14a6
[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f
-s ours am: b476242ced
-s ours am: f0ea141e5d
-s ours am: e924552033
-s ours
...
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1825152
Change-Id: I2aa696f1bdb9db96f6b4fcaa45856cadd4ef90e0
2021-09-16 20:11:26 +00:00
Treehugger Robot
e924552033
[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f
-s ours am: b476242ced
-s ours am: f0ea141e5d
-s ours
...
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1825152
Change-Id: I160730118ed965b65034a0ce2afa7cbda8fbc879
2021-09-16 19:52:34 +00:00
David Anderson
cc21670121
Merge "Avoid too much reserved_size for erofs image" am: dfc9d7912f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1821097
Change-Id: I9111ffc26870f62714d869fdf946c0a42f3c6232
2021-09-16 19:48:20 +00:00
Presubmit Automerger Backend
0ea141f5bd
[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa
am: 032007da30
-s ours am: dac931580c
-s ours am: 3f86ccda1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Change-Id: I8e8ed17dcfad0f24ec5f449662fab5be9e2477ca
2021-09-16 19:39:06 +00:00
Treehugger Robot
f0ea141e5d
[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f
-s ours am: b476242ced
-s ours
...
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1825152
Change-Id: I28d4695e1c687aa077498bd8bfe258480f41087d
2021-09-16 19:38:56 +00:00
Presubmit Automerger Backend
681ff3287a
[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa
am: 032007da30
-s ours am: 921ed71f1a
-s ours am: 4f1aa78ab2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Change-Id: Idcbf1c78aff3185a6d5ab4f34e88c419541ee5d4
2021-09-16 19:38:53 +00:00
Paul Scovanner
4266ea8c7f
Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into sc-dev-plus-aosp am: 3e2043263b
am: 85e54a64cb
am: 4fda657141
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821024
Change-Id: I37a01550cada988ed7d7b416da6601f365414d76
2021-09-16 19:38:11 +00:00
Presubmit Automerger Backend
ca6c26d878
[automerger skipped] [conflict] [DO NOT MERGE] 2p: 0449bb97fa
am: 541828d6f0
am: 0d9963c809
-s ours am: c1b72987e6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821024
Change-Id: I752eb34add0ae27d5fa8d511923e19d41c1c8c66
2021-09-16 19:38:09 +00:00
David Anderson
dfc9d7912f
Merge "Avoid too much reserved_size for erofs image"
2021-09-16 19:36:29 +00:00
Treehugger Robot
b476242ced
[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." am: 258fca9a8f
-s ours
...
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 cda1f3768f
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1825152
Change-Id: Ia406d5b1f8d1529c9af066499a4d15d118e410b6
2021-09-16 19:23:57 +00:00
Presubmit Automerger Backend
3f86ccda1c
[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa
am: 032007da30
-s ours am: dac931580c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Change-Id: I8eb351698218228398bd3035a2d9d75f8ce36b11
2021-09-16 19:23:41 +00:00
Presubmit Automerger Backend
4f1aa78ab2
[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa
am: 032007da30
-s ours am: 921ed71f1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Change-Id: I786d5d80b61671ee5cbec8ba113f3e5f705f040d
2021-09-16 19:23:35 +00:00
Paul Scovanner
4fda657141
Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into sc-dev-plus-aosp am: 3e2043263b
am: 85e54a64cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821024
Change-Id: I994fa4508153b18bfed228d975497c486ff6df87
2021-09-16 19:23:19 +00:00
Presubmit Automerger Backend
c1b72987e6
[automerger skipped] [conflict] [DO NOT MERGE] 2p: 0449bb97fa
am: 541828d6f0
am: 0d9963c809
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821024
Change-Id: I3c9ab5418933e9fb29266de77122d8cda1d5e947
2021-09-16 19:23:18 +00:00
Paul Scovanner
bdb63576ff
Update Security String to 2021-11-01
...
Bug: 199784479
Change-Id: Iaf0b0863f6a4e667a5a8f291e1252d8d2dff1ec6
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 19:03:08 +00:00
Presubmit Automerger Backend
dac931580c
[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa
am: 032007da30
-s ours
...
am skip reason: Merged-In I7e03900c5d853b32f8fbd75cb591063ba4a27450 with SHA-1 0449bb97fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Change-Id: I688051fcda66ebc580d531276a8db090bb0de390
2021-09-16 19:01:37 +00:00
Presubmit Automerger Backend
921ed71f1a
[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa
am: 032007da30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Change-Id: I5d7a4d12b0ddd788f0c1ffeecd98abdf3c0904cb
2021-09-16 19:01:35 +00:00
Paul Scovanner
85e54a64cb
Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into sc-dev-plus-aosp am: 3e2043263b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821024
Change-Id: I0b45033195509dcf4beae84435084d5c166dabbb
2021-09-16 19:01:07 +00:00
Presubmit Automerger Backend
0d9963c809
[conflict] [DO NOT MERGE] 2p: 0449bb97fa
am: 541828d6f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821024
Change-Id: I03abf503bd096fb3f1f00e438dc321aa8e10ec31
2021-09-16 19:01:07 +00:00
Presubmit Automerger Backend
e748aaf0a3
[automerger skipped] [automerge] [DO NOT MERGE] 2p: 0449bb97fa
am: 0e95bd021f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Change-Id: Ib4a3bf6c52b417605ca8125701e9a0c0a7e9999c
2021-09-16 19:00:58 +00:00
Treehugger Robot
258fca9a8f
Merge "Move the stable code from version_defaults.mk to version_util.mk."
2021-09-16 18:56:09 +00:00
Yuntao Xu
2bf33c458f
move cts-test-coverage
...
Moved cts-test-coverage from cts/build/ to build/make/core/tasks/cts.mk.
Bug: 190635892
Test: m cts-test-coverage
Test: TreeHugger
Change-Id: I161adebc356b693329dfe48661476840c32beaa6
2021-09-16 11:55:08 -07:00
Daniel Norman
fa27c7c3b9
Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e
am: 4495b649ef
am: adbf8de8d3
am: 9fb65dcb87
am: b425ba7189
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615
Change-Id: I04821f2a26858de2978d825a1cd93abc431ea831
2021-09-16 18:48:59 +00:00
Paul Scovanner
3e2043263b
Merge changes from topic "presubmit-am-eb1892e785d84ba080947a5e15b95c90" into sc-dev-plus-aosp
...
* changes:
[conflict] [DO NOT MERGE] 2p: 0449bb97fa
[DO NOT MERGE] Update Security String to 2021-11-05
2021-09-16 18:47:38 +00:00
Daniel Norman
b425ba7189
Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e
am: 4495b649ef
am: adbf8de8d3
am: 9fb65dcb87
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615
Change-Id: Ic2ae9944b9cf839835d8d1619080b040555ba77e
2021-09-16 18:28:06 +00:00
Daniel Norman
9fb65dcb87
Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e
am: 4495b649ef
am: adbf8de8d3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615
Change-Id: I432d7aac60d833a35e03f00120c0935d6cd69650
2021-09-16 18:14:03 +00:00
Yuntao Xu
1930a6f566
[automerger skipped] Merge "Add android-cts-verifier.zip" am: a1b1f638d3
am: 34f50fefad
-s ours am: d59357cb32
-s ours am: 4700488712
-s ours am: c564773a98
-s ours
...
am skip reason: Merged-In I63b2da75391221119025b597257c26906718cf77 with SHA-1 2bbe1fe2d4
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673
Change-Id: I4cdf9f89db6c0c569c06e2c4c3267e2d6ee96dd1
2021-09-16 18:09:36 +00:00
Daniel Norman
adbf8de8d3
Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e
am: 4495b649ef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615
Change-Id: Ia857f853b2f87f47c72a1a624fa9d93fd80ed596
2021-09-16 18:01:02 +00:00
Yuntao Xu
c564773a98
[automerger skipped] Merge "Add android-cts-verifier.zip" am: a1b1f638d3
am: 34f50fefad
-s ours am: d59357cb32
-s ours am: 4700488712
-s ours
...
am skip reason: Merged-In I63b2da75391221119025b597257c26906718cf77 with SHA-1 2bbe1fe2d4
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673
Change-Id: I71d971a2ad448b1a6a24a5be4f29823c129424f9
2021-09-16 17:53:37 +00:00
Daniel Norman
4495b649ef
Merge "Build vendor images first when rebuilding with vendor_otatools." am: a529e0fd2e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1826615
Change-Id: I71cca612bf0925be76fd7d4a91d652af12be4ca2
2021-09-16 17:44:49 +00:00
Yuntao Xu
4700488712
[automerger skipped] Merge "Add android-cts-verifier.zip" am: a1b1f638d3
am: 34f50fefad
-s ours am: d59357cb32
-s ours
...
am skip reason: Merged-In I63b2da75391221119025b597257c26906718cf77 with SHA-1 2bbe1fe2d4
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673
Change-Id: Ibeea1c1ec7c22fc2b25232826c4e29b0069a5cd4
2021-09-16 17:40:48 +00:00
Yuntao Xu
d59357cb32
[automerger skipped] Merge "Add android-cts-verifier.zip" am: a1b1f638d3
am: 34f50fefad
-s ours
...
am skip reason: Merged-In I63b2da75391221119025b597257c26906718cf77 with SHA-1 2bbe1fe2d4
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673
Change-Id: If2fa2dc8ecbf8367436c0057a2c43c48efba4eb2
2021-09-16 17:40:19 +00:00
Daniel Norman
a529e0fd2e
Merge "Build vendor images first when rebuilding with vendor_otatools."
2021-09-16 17:29:43 +00:00
Yuntao Xu
34f50fefad
Merge "Add android-cts-verifier.zip" am: a1b1f638d3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1820673
Change-Id: Ib46b9e711faf8f663e1ba26a2e2ccf8d13b07f57
2021-09-16 17:22:44 +00:00
Yuntao Xu
a1b1f638d3
Merge "Add android-cts-verifier.zip"
2021-09-16 17:06:16 +00:00
Presubmit Automerger Backend
541828d6f0
[conflict] [DO NOT MERGE] 2p: 0449bb97fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Bug: 199784479
Change-Id: I4ee0a8240ace16d1a85b637b3d70568bae289693
2021-09-16 13:20:30 +00:00
Presubmit Automerger Backend
032007da30
[automerge] [DO NOT MERGE] 2p: 0449bb97fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Bug: 199784479
Change-Id: Ifa2b7532b7d59bd2b7f9ad87c3a00698cb7c215d
2021-09-16 11:39:22 +00:00
Presubmit Automerger Backend
0e95bd021f
[automerge] [DO NOT MERGE] 2p: 0449bb97fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15821927
Bug: 199784479
Change-Id: Ibd3a3ab988ed8c8846363d513909553c0d0c8160
2021-09-16 11:39:20 +00:00
Paul Scovanner
0449bb97fa
[DO NOT MERGE]
...
Update Security String to 2021-11-05
Bug: 199784479
Change-Id: I7e03900c5d853b32f8fbd75cb591063ba4a27450
Merged-In: I7e03900c5d853b32f8fbd75cb591063ba4a27450
2021-09-16 11:39:07 +00:00
Treehugger Robot
0cdc64c97e
Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec
am: 36ebb662c3
am: 7a72ba165b
am: 0b048475f1
am: ca7628a322
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192
Change-Id: I3081efb479369954c6c601f85afb648e48274307
2021-09-16 10:38:26 +00:00
Treehugger Robot
ca7628a322
Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec
am: 36ebb662c3
am: 7a72ba165b
am: 0b048475f1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192
Change-Id: I6339eed7a5bfa14c9451aa8f55a168603babc66f
2021-09-16 10:23:39 +00:00
Treehugger Robot
0b048475f1
Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec
am: 36ebb662c3
am: 7a72ba165b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192
Change-Id: I8cfdc7dab454b7a11d862385fd972472b13d4fe0
2021-09-16 10:09:02 +00:00
Treehugger Robot
7a72ba165b
Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec
am: 36ebb662c3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192
Change-Id: I707952bbc214cf8d9e9d79905a8fe3998061b26e
2021-09-16 09:54:13 +00:00