StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,016 Commits 1 Branch 0 Tags
c35d56b5737a02277bb9cc31894936a07880db9c
Commit Graph

74016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
36ebb662c3 Merge "Clean up gki-5.4 related rules in GSI" am: 389170f9ec 
Original change: https://android-review.googlesource.com/c/platform/build/+/1825192

Change-Id: I6db74dc855b814c00ee8cb90628b673633ae3d44
 2021-09-16 09:38:52 +00:00
Treehugger Robot
389170f9ec Merge "Clean up gki-5.4 related rules in GSI" 2021-09-16 09:22:59 +00:00
TreeHugger Robot
9acfda5c94 [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into stage-aosp-master am: acdfa0f404 -s ours am: 3b9fb48c82 -s ours am: 1eb51514ef -s ours am: 426c8407af -s ours 
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 1d7923e7d8 is already in history

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

Change-Id: Ida853deb45d7157377414d0885ccf3b3d8884a3f
 2021-09-16 08:01:18 +00:00
Yuntao Xu
93992486b1 [automerger skipped] Merge "Add the cts-platform-version check" am: 3d4c52d6ed -s ours am: db3ab0fe7a -s ours am: aa68e1d844 -s ours am: d55090b0e1 -s ours am: 8c5057592c -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: Iee373c1de4edb7eaca9e35e710b066aa8070cbef
 2021-09-16 08:01:08 +00:00
Yuntao Xu
00befb2c4b [automerger skipped] Merge "Revert^2 "Add the cts-platform-version check"" into stage-aosp-master am: 4800938d69 -s ours am: a4eb32f1c5 -s ours am: 2b4fc1c270 -s ours am: 3daae93e2d -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: I55b62973e9a44ce3227283bcaf101f6df9dfb8d0
 2021-09-16 08:00:49 +00:00
TreeHugger Robot
3c0a785f11 [automerger skipped] Merge "Revert "Add the cts-platform-version check"" into stage-aosp-master am: 51b135732f -s ours am: 4c01db4e15 -s ours am: 9731aa026e -s ours am: 283317ecc7 -s ours 
am skip reason: skipped by user yuntaoxu

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

Change-Id: I85f0b87b48bcbc031f6824cb8b78beabacc8b6d5
 2021-09-16 08:00:06 +00:00
TreeHugger Robot
426c8407af [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into stage-aosp-master am: acdfa0f404 -s ours am: 3b9fb48c82 -s ours am: 1eb51514ef -s ours 
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 1d7923e7d8 is already in history

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

Change-Id: I216bd40c6c705c39e5cf570c8686ef06e95a0777
 2021-09-16 07:45:14 +00:00
Yuntao Xu
8c5057592c [automerger skipped] Merge "Add the cts-platform-version check" am: 3d4c52d6ed -s ours am: db3ab0fe7a -s ours am: aa68e1d844 -s ours am: d55090b0e1 -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: Id48fd1524d918974462171aaf41e9eabe44c7279
 2021-09-16 07:45:09 +00:00
Yuntao Xu
3daae93e2d [automerger skipped] Merge "Revert^2 "Add the cts-platform-version check"" into stage-aosp-master am: 4800938d69 -s ours am: a4eb32f1c5 -s ours am: 2b4fc1c270 -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: I00a9ea789efab3e8e9d3ea0e16f26d89ffe1aa45
 2021-09-16 07:44:59 +00:00
TreeHugger Robot
283317ecc7 [automerger skipped] Merge "Revert "Add the cts-platform-version check"" into stage-aosp-master am: 51b135732f -s ours am: 4c01db4e15 -s ours am: 9731aa026e -s ours 
am skip reason: skipped by user yuntaoxu

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

Change-Id: I7aba2d10854ddab9d7f28886defc095e38c98e16
 2021-09-16 07:44:32 +00:00
Treehugger Robot
8b782dae03 Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" am: dcc78a8f0a am: 46b9fe39ac am: 848ca42fc6 am: c2f1632abf am: d0a7bda5b5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826981

Change-Id: I8785e3522d3c31791066e0c6c1506dade51b8d49
 2021-09-16 07:35:16 +00:00
Yuntao Xu
f56391e1f0 [automerger skipped] Merge "Add the cts-platform-version check" into stage-aosp-master am: 61ba5389a7 -s ours am: f7a2ba8adc -s ours am: c70fc7efbf -s ours am: d97ba979a9 -s ours 
am skip reason: skipped by user yuntaoxu

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

Change-Id: I4582fb2f3c513173f346c35b9f6ba1ae789f4244
 2021-09-16 07:34:59 +00:00
TreeHugger Robot
1eb51514ef [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into stage-aosp-master am: acdfa0f404 -s ours am: 3b9fb48c82 -s ours 
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 1d7923e7d8 is already in history

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

Change-Id: Ic4374758c61798d5672871a303a97f5b52922f23
 2021-09-16 07:26:08 +00:00
Yuntao Xu
d55090b0e1 [automerger skipped] Merge "Add the cts-platform-version check" am: 3d4c52d6ed -s ours am: db3ab0fe7a -s ours am: aa68e1d844 -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: I6176e88c14127a409e22ce936b7ba7daa59eab06
 2021-09-16 07:26:02 +00:00
Yuntao Xu
2b4fc1c270 [automerger skipped] Merge "Revert^2 "Add the cts-platform-version check"" into stage-aosp-master am: 4800938d69 -s ours am: a4eb32f1c5 -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: I10b8db1bac5bd5116e902e956b2d7b93cd351d96
 2021-09-16 07:25:54 +00:00
TreeHugger Robot
9731aa026e [automerger skipped] Merge "Revert "Add the cts-platform-version check"" into stage-aosp-master am: 51b135732f -s ours am: 4c01db4e15 -s ours 
am skip reason: skipped by user yuntaoxu

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

Change-Id: I142b5d4018f7d85799acabc4f08fe6d544f6880a
 2021-09-16 07:25:31 +00:00
Treehugger Robot
d0a7bda5b5 Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" am: dcc78a8f0a am: 46b9fe39ac am: 848ca42fc6 am: c2f1632abf 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826981

Change-Id: Ia111b76a50cd20b4fb917ff65882b96920e868ec
 2021-09-16 07:17:39 +00:00
Yuntao Xu
d97ba979a9 [automerger skipped] Merge "Add the cts-platform-version check" into stage-aosp-master am: 61ba5389a7 -s ours am: f7a2ba8adc -s ours am: c70fc7efbf -s ours 
am skip reason: skipped by user yuntaoxu

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

Change-Id: Ibf26a4652720bd83c72626bf121a893381d8ffb3
 2021-09-16 07:17:11 +00:00
TreeHugger Robot
3b9fb48c82 [automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into stage-aosp-master am: acdfa0f404 -s ours 
am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 1d7923e7d8 is already in history

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

Change-Id: I24bffcfe55c36a3e7434b436b22b0b52c666d367
 2021-09-16 07:15:16 +00:00
Yuntao Xu
aa68e1d844 [automerger skipped] Merge "Add the cts-platform-version check" am: 3d4c52d6ed -s ours am: db3ab0fe7a -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: Icf4d2f3905294d2c00dbd3a1093661dcad579bf7
 2021-09-16 07:15:10 +00:00
Yuntao Xu
a4eb32f1c5 [automerger skipped] Merge "Revert^2 "Add the cts-platform-version check"" into stage-aosp-master am: 4800938d69 -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: I2c79c45d105b818858f472625b8df80b69363191
 2021-09-16 07:15:02 +00:00
TreeHugger Robot
4c01db4e15 [automerger skipped] Merge "Revert "Add the cts-platform-version check"" into stage-aosp-master am: 51b135732f -s ours 
am skip reason: skipped by user yuntaoxu

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

Change-Id: Ifaec317f6ced67fceace4ee9d3824ec6ec58425d
 2021-09-16 07:14:05 +00:00
Treehugger Robot
c2f1632abf Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" am: dcc78a8f0a am: 46b9fe39ac am: 848ca42fc6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826981

Change-Id: I19379e16ed9093778dac87d35c0465b7812b7709
 2021-09-16 07:08:20 +00:00
Yuntao Xu
c70fc7efbf [automerger skipped] Merge "Add the cts-platform-version check" into stage-aosp-master am: 61ba5389a7 -s ours am: f7a2ba8adc -s ours 
am skip reason: skipped by user yuntaoxu

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

Change-Id: I265b3268e97f8ecc535f59de7cee480fc375fadc
 2021-09-16 07:07:49 +00:00
Treehugger Robot
848ca42fc6 Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" am: dcc78a8f0a am: 46b9fe39ac 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826981

Change-Id: Ibf79227ac4096795cd18c29d5635a42293e24529
 2021-09-16 06:55:41 +00:00
Yuntao Xu
f7a2ba8adc [automerger skipped] Merge "Add the cts-platform-version check" into stage-aosp-master am: 61ba5389a7 -s ours 
am skip reason: skipped by user yuntaoxu

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

Change-Id: Idc0ca9206a355ab839cddb089639218912666c32
 2021-09-16 06:54:24 +00:00
TreeHugger Robot
acdfa0f404 Merge "Move the stable code from version_defaults.mk to version_util.mk." into stage-aosp-master 2021-09-16 01:49:28 +00:00
Yuntao Xu
26b9e3ba31 Add android-cts-verifier.zip 
Adding android-cts-verifier.zip to $(HOST_OUT)/cts-verifier at
build/make/core/tasks/cts.mk.

Bug: 190635892
Test: m cts
Test: TreeHugger
Change-Id: I63b2da75391221119025b597257c26906718cf77
Merged-In: I63b2da75391221119025b597257c26906718cf77
 2021-09-15 18:04:04 -07:00
Sasha Smundak
cda1f3768f 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-15 16:12:05 -07:00
Daniel Norman
78554ea568 Build vendor images first when rebuilding with vendor_otatools. 
Only supports rebuilding vendor.img and odm.img currently.

This allows "other" images (e.g. vbmeta, super_empty, ...) to
be rebuilt using the latest tooling.

Bug: 188491126
Bug: 192422274
Test: Sign a GRF R+S merged target_files package using:
      sign_target_files_apks \
        --vendor_otatools=<otatools.zip from R> \
	--vendor_partitions=vendor,odm \
	merged-target_files.zip \
	signed-target_files.zip
Change-Id: Ib93aea9f083ee9b722c31a42dcc780b5222053b8
 2021-09-15 21:53:25 +00:00
Yuntao Xu
db3ab0fe7a [automerger skipped] Merge "Add the cts-platform-version check" am: 3d4c52d6ed -s ours 
am skip reason: Merged-In I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2 with SHA-1 9c2fea67e9 is already in history

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

Change-Id: I42ae137d52e3d81133e68eed36bb1d72f8d4b3fa
 2021-09-15 21:44:52 +00:00
Yuntao Xu
3d4c52d6ed Merge "Add the cts-platform-version check" 2021-09-15 21:28:54 +00:00
Yuntao Xu
4800938d69 Merge "Revert^2 "Add the cts-platform-version check"" into stage-aosp-master 2021-09-15 19:17:21 +00:00
Yuntao Xu
0f4f449343 Revert^2 "Add the cts-platform-version check" 
712cf0a586

Change-Id: I5339a63a672ee2f09364bc8d2aee27d55c9305a6
Merged-In: I613ac5b5014dbf4e6202e1dbd1b6a92359817cf2
 2021-09-15 17:31:40 +00:00
TreeHugger Robot
51b135732f Merge "Revert "Add the cts-platform-version check"" into stage-aosp-master 2021-09-15 08:16:31 +00:00
Treehugger Robot
46b9fe39ac Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" am: dcc78a8f0a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826981

Change-Id: Ia05ae800c3d10fb07e16fdc9a7fe6a8bf21e748f
 2021-09-15 08:09:01 +00:00
Treehugger Robot
dcc78a8f0a Merge "Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected" 2021-09-15 07:53:22 +00:00
Yuntao Xu
712cf0a586 Revert "Add the cts-platform-version check" 
Revert submission 15776724-rewrite cts-platform-version-check module

Reason for revert: merge conflicts with sc-dev-plus-aosp
Reverted Changes:
I7d018d2b3:Remove os/Android.mk
I613ac5b50:Add the cts-platform-version check

Change-Id: Ic4a9c58c46ffadb5fcaadd1649e54a9fa2a69285
 2021-09-15 05:10:34 +00:00
Paul Scovanner
2d962087e4 Merge "Update Security String to 2021-11-05" 2021-09-15 02:56:47 +00:00
Treehugger Robot
dba0212c54 Merge "Zipalign: Avoid unnecessary padding" am: 50ec71eac8 am: 4e23cac241 am: 244ffc3bed am: bb51371e28 am: f683f8b1b4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826624

Change-Id: I006337f53d87e5612696c40e1cf723378f394cc9
 2021-09-15 01:35:59 +00:00
TreeHugger Robot
c5adf09787 [automerger skipped] Merge "Roll-forward the VNDK snapshot list of GSI" into sc-v2-dev am: 33a7ecce72 -s ours am: 8e13bf4465 -s ours 
am skip reason: Merged-In Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22 with SHA-1 33fc244de5 is already in history

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

Change-Id: Id86af10c5f843be6a422d19c8bbf4251df5ba129
 2021-09-15 01:35:09 +00:00
Treehugger Robot
f683f8b1b4 Merge "Zipalign: Avoid unnecessary padding" am: 50ec71eac8 am: 4e23cac241 am: 244ffc3bed am: bb51371e28 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826624

Change-Id: Ic71ec1b5e9edb224097a5e87170a6dfc0f5573d6
 2021-09-15 01:34:56 +00:00
Kousik Kumar
2b2b87fe80 Ensure RBE_CXX_POOL and RBE_JAVA_POOL variables work as expected 
These environment variables are not being passed onto compile actions created from makefiles. This change makes sure that these env variables are passed along so that we are able to update the C++ / Javac pool being used

Test: Ran a build with RBE_CXX_POOL=cpp_next to test the next pool
Bug: b/199774309
Change-Id: Icd47d3647b962a6c3ac712369466d5502b817fd7
 2021-09-14 21:31:38 -04:00
TreeHugger Robot
8e13bf4465 [automerger skipped] Merge "Roll-forward the VNDK snapshot list of GSI" into sc-v2-dev am: 33a7ecce72 -s ours 
am skip reason: Merged-In Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22 with SHA-1 33fc244de5 is already in history

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

Change-Id: If99acc59d0570c955fc26c8d0dc2f12426d494a6
 2021-09-15 01:19:44 +00:00
Treehugger Robot
bb51371e28 Merge "Zipalign: Avoid unnecessary padding" am: 50ec71eac8 am: 4e23cac241 am: 244ffc3bed 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826624

Change-Id: Ie9790e6c4024b6a9a281723e773bc1ded4c06c45
 2021-09-15 01:15:08 +00:00
TreeHugger Robot
33a7ecce72 Merge "Roll-forward the VNDK snapshot list of GSI" into sc-v2-dev 2021-09-15 01:04:04 +00:00
Yuntao Xu
61ba5389a7 Merge "Add the cts-platform-version check" into stage-aosp-master 2021-09-15 01:00:36 +00:00
Treehugger Robot
244ffc3bed Merge "Zipalign: Avoid unnecessary padding" am: 50ec71eac8 am: 4e23cac241 
Original change: https://android-review.googlesource.com/c/platform/build/+/1826624

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

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

Change-Id: I1586a650d2e742074d7877b3a77be20de1985694
 2021-09-15 00:57:59 +00:00