Commit Graph

31955 Commits

Author SHA1 Message Date
Treehugger Robot
64d83852e8 Merge "Revert "Fix inheritance order"" am: ea8eedde00 am: 3f67c2235a
Original change: https://android-review.googlesource.com/c/platform/build/+/2054825

Change-Id: I7132665f117006d3bc33039662948bc108337b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 21:50:32 +00:00
Treehugger Robot
cd2eca27f7 Merge "Make dir work on multiple paths" 2022-04-04 21:47:46 +00:00
Treehugger Robot
10976c77b2 Merge "Remove regex functionality from rbcrun" am: bd78ed0726 am: 1b7d02336d am: 39a0861614
Original change: https://android-review.googlesource.com/c/platform/build/+/2048503

Change-Id: I0013f0e3891f6082de46419f1893dd0da34055c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 21:35:20 +00:00
Treehugger Robot
3f67c2235a Merge "Revert "Fix inheritance order"" am: ea8eedde00
Original change: https://android-review.googlesource.com/c/platform/build/+/2054825

Change-Id: I457b7bf11c6a15fdcdcad464f83379c3e986b46b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 21:29:00 +00:00
Treehugger Robot
39a0861614 Merge "Remove regex functionality from rbcrun" am: bd78ed0726 am: 1b7d02336d
Original change: https://android-review.googlesource.com/c/platform/build/+/2048503

Change-Id: I0fd1862b3949efe75b73ca13786ca430bcfd9f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 21:16:51 +00:00
Treehugger Robot
ea8eedde00 Merge "Revert "Fix inheritance order"" 2022-04-04 21:07:26 +00:00
Treehugger Robot
1b7d02336d Merge "Remove regex functionality from rbcrun" am: bd78ed0726
Original change: https://android-review.googlesource.com/c/platform/build/+/2048503

Change-Id: I3707f19f550e7f4ded82c4b2bfec3859cd7a656d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 20:59:25 +00:00
Treehugger Robot
bd78ed0726 Merge "Remove regex functionality from rbcrun" 2022-04-04 20:36:35 +00:00
Cole Faust
32e413a294 Fix single value variable inheritance order
List variables needed to be percolated in the order of inherit() calls.
children.keys() was in that order, due to starlark dictionaries being
iterable in the order of insertion, but the previous cl broke that
behavior by sorting them. Instead, only sort the children for
single value variables.

Fixes: 226206409
Fixes: 228044099
Test: ./out/rbcrun ./build/make/tests/run.rbc and testing aosp_arm64
Change-Id: I5b91514e87b158b615e4d4ec7868fccb0248379b
2022-04-04 11:55:02 -07:00
Cole Faust
56d7c008bc Revert "Fix inheritance order"
This reverts commit 670c587c09.

Reason for revert: Breaks RBC product config for more products than it fixes: b/228044099

Change-Id: I614663311f67b3631a0cee427453c550fc426c8b
2022-04-04 17:28:28 +00:00
Android Build Coastguard Worker
009bc147a3 Make change and version bump to TP1A.220404.001
Change-Id: Ic2082a30feae85494611116cc67cbf654ff25638
2022-04-03 23:20:23 +00:00
Xin Li
25e7578344 Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master 2022-04-03 06:41:19 +00:00
Android Build Coastguard Worker
09875fff98 Make change and version bump to TP1A.220403.001
Change-Id: Ide6117ad1897cbdbb98b0c3ef6aaf933d3194cd9
2022-04-02 23:20:08 +00:00
Android Build Coastguard Worker
dd734ad722 Make change and version bump to SQ3A.220403.001
Change-Id: Ibeb8ab0289240321f10a3e2ba03bc1c11a95f085
2022-04-02 21:18:35 +00:00
Android Build Coastguard Worker
654f421bc3 Make change and version bump to TP1A.220402.001
Change-Id: Ifbdc166ec16532d607f192d4e649a4b204fa3085
2022-04-02 03:21:17 +00:00
Android Build Coastguard Worker
3ab2cee8b7 Make change and version bump to SQ3A.220402.001
Change-Id: Id3881011b073b2336c6d91d652b053d1ea9ba254
2022-04-02 01:18:23 +00:00
Bob Badour
061d7e6f2b Support more dependencies for license metadata.
Bug: 213388645

Test: m vts reportmissinglicenses

Change-Id: I8de06c802d2397d02d9c2152f764b1d5ea2f795c
2022-04-01 16:02:40 -07:00
Cole Faust
7679a8e6aa Merge "Fix inheritance order" am: 5e0edffa3c am: 2fbf34c207 am: 12c4475814
Original change: https://android-review.googlesource.com/c/platform/build/+/2052013

Change-Id: I2192fa725afb35f090ab1621e4c183d07ae11386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 21:02:36 +00:00
Cole Faust
12c4475814 Merge "Fix inheritance order" am: 5e0edffa3c am: 2fbf34c207
Original change: https://android-review.googlesource.com/c/platform/build/+/2052013

Change-Id: I7cee84a655c9b1bbc6e86883708bd200c0af434e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 20:49:40 +00:00
Xin Li
f36e10b1f9 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Ib35026f71208afa53f33ee9967cd9acb88a73d0d
Change-Id: If4821c4f2d7e8a0c1cae728a7719be33277a1b2e
2022-04-01 20:37:49 +00:00
Cole Faust
5e0edffa3c Merge "Fix inheritance order" 2022-04-01 19:55:21 +00:00
Cole Faust
bbc27ea077 Make dir work on multiple paths
To increase its feature parity with our notdir
implementation and gnu make.

Bug: 227245326
Test: Manually
Change-Id: Ied975f934d7af963e0099054c416f0d364aec8f9
2022-04-01 12:09:40 -07:00
Android Build Coastguard Worker
b029beaab9 Version bump to SQ3A.220401.002 [core/build_id.mk]
Change-Id: I7f8cee6758121579f3f5233c66d7f51d24a854d4
2022-04-01 18:58:38 +00:00
Android Build Coastguard Worker
9dcfea86b4 Version bump to TP1A.220401.003 [core/build_id.mk]
Change-Id: I6d9fd8b48def9ff4f53cefeec2296fde9662486b
2022-04-01 15:47:19 +00:00
Yihan Dong
e45ff68740 Add additional license dependencies for VTS
Bug: 213388645
Test: m vts
Change-Id: I5f0b35b5ec943f5628f118bf0812391047b49708
2022-04-01 09:35:27 +00:00
Lucas Wei
4da8bbe987 Merge "Remove ALL_GENERATED_SOURCES" am: 20ba096e0a am: 766d8ec746 am: 85f3330d6c
Original change: https://android-review.googlesource.com/c/platform/build/+/2043036

Change-Id: I344c51da9578f73b091dc5e52c918f3ecfa6daf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 04:05:38 +00:00
Lucas Wei
85f3330d6c Merge "Remove ALL_GENERATED_SOURCES" am: 20ba096e0a am: 766d8ec746
Original change: https://android-review.googlesource.com/c/platform/build/+/2043036

Change-Id: Iaa8abf62ec376e5d846937bc7823345bb9c0e280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 03:45:01 +00:00
Lucas Wei
20ba096e0a Merge "Remove ALL_GENERATED_SOURCES" 2022-04-01 03:00:10 +00:00
Android Build Coastguard Worker
ef15c8e52a Version bump to TP1A.220401.002 [core/build_id.mk]
Change-Id: Id6f16c26bb378f1f7f03133901a65bfa844b67ac
2022-04-01 01:41:16 +00:00
Android Build Coastguard Worker
0892a2b23d Make change and version bump to TP1A.220401.001
Change-Id: I3b30a4a1c6e75d65ef9ba6415d89db22b9a08e33
2022-04-01 01:20:56 +00:00
Cole Faust
670c587c09 Fix inheritance order
The children to inherit from were not sorted. This
wasn't a problem for list variables, because all those
inheritances get merged together based on the @inherit/
values in the list variables. But for single value variables
it made a difference.

Bug: 226206409
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ib56bbb91a79fe8c7cb780c253f5bd8d6c0e87765
2022-03-31 17:30:35 -07:00
Android Build Coastguard Worker
91a6a8f154 Version bump to TP1A.220331.002 [core/build_id.mk]
Change-Id: Ifd9f9a5835c04e11043bd090e029924c83102b18
2022-03-31 23:39:12 +00:00
Android Build Coastguard Worker
6c4c0f90bc Make change and version bump to SQ3A.220401.001
Change-Id: Ie1d4283c927053ff6e276ba85a68169b1473048c
2022-03-31 23:18:43 +00:00
Colin Cross
44db5fc65c Merge "Reset permissions after unzipping jars" am: bcabb923dc am: 82a15e7798 am: c28d43119f
Original change: https://android-review.googlesource.com/c/platform/build/+/2050411

Change-Id: I0e053c91cc8a57e7f79f08eb1681a5998d349bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 20:51:40 +00:00
Colin Cross
c28d43119f Merge "Reset permissions after unzipping jars" am: bcabb923dc am: 82a15e7798
Original change: https://android-review.googlesource.com/c/platform/build/+/2050411

Change-Id: Ib35026f71208afa53f33ee9967cd9acb88a73d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 20:36:53 +00:00
Colin Cross
bcabb923dc Merge "Reset permissions after unzipping jars" 2022-03-31 19:35:06 +00:00
Trevor Radcliffe
74a4de735b Make changes to support test_suites for test lib
Had to make changes to make to ensure that we don't duplicate

Bug: 226402757
Test: Confirmed that libraries are installed to the correct place
Change-Id: I64e4a5ab7cac3fb57442d19b0f796fffb0a3f48a
2022-03-31 18:15:58 +00:00
Treehugger Robot
a35c859df7 Merge "Support per-partition settings for os_version AVB props" am: 4a723d0ecf am: f2ed2638d2 am: fd3cabf6cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2049103

Change-Id: I0dd1df61f6810c0f5821c44f12c1452a2bae3e78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 03:24:30 +00:00
Colin Cross
a8ac282038 Reset permissions after unzipping jars
Jars unzipped for jacoco instrumentation may contain nonsensical
permissions.  Use chmod -R =rwX to apply the current umask to all
the files and add the execute bit to directories.

Bug: 227470935
Test: manual
Change-Id: I52667ec3f0b8b8ce64b57fab088ca9d20cf561e1
2022-03-30 20:05:34 -07:00
Treehugger Robot
fd3cabf6cf Merge "Support per-partition settings for os_version AVB props" am: 4a723d0ecf am: f2ed2638d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2049103

Change-Id: Ib984b03d68527107043ad4c43517e8240fd2e345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 03:02:58 +00:00
Treehugger Robot
4a723d0ecf Merge "Support per-partition settings for os_version AVB props" 2022-03-31 02:27:04 +00:00
Android Build Coastguard Worker
7a8bfa79cd Make change and version bump to TP1A.220331.001
Change-Id: I5f6ae0742306c7c2aaa03ddb46b560b5d7b43fbc
2022-03-31 01:20:30 +00:00
Android Build Coastguard Worker
46048c4b54 Make change and version bump to SQ3A.220331.001
Change-Id: I2b40967eb86dbbc622160bf4969be59fced992af
2022-03-30 23:18:29 +00:00
Treehugger Robot
6d9c577359 Merge "Build modules from source for module products." am: 06f7176fc6 am: cbe2b0a7a9 am: f1d08ac906
Original change: https://android-review.googlesource.com/c/platform/build/+/2020203

Change-Id: Ic402f43b7ab810dc7a7039dcdd816e211c4ffee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:44:01 +00:00
Treehugger Robot
f1d08ac906 Merge "Build modules from source for module products." am: 06f7176fc6 am: cbe2b0a7a9
Original change: https://android-review.googlesource.com/c/platform/build/+/2020203

Change-Id: I5dda82bdfe84e323ea2120b9c2ea6285e2b873f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:15:25 +00:00
Cole Faust
42d34135be Merge "Update paths to mk2rbc/rbcrun" am: 4f414a9f52 am: 79e86e7fcc am: b203ae3da8
Original change: https://android-review.googlesource.com/c/platform/build/+/2043368

Change-Id: I4611ecae219acd088860084397ab4579fd20516c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:44:02 +00:00
Treehugger Robot
06f7176fc6 Merge "Build modules from source for module products." 2022-03-30 20:41:53 +00:00
Cole Faust
b203ae3da8 Merge "Update paths to mk2rbc/rbcrun" am: 4f414a9f52 am: 79e86e7fcc
Original change: https://android-review.googlesource.com/c/platform/build/+/2043368

Change-Id: If646d6106cbcc1fc88b51014da3a12f5bd8777e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:20:42 +00:00
Cole Faust
4f414a9f52 Merge "Update paths to mk2rbc/rbcrun" 2022-03-30 19:43:06 +00:00
Cole Faust
62878a2cef Remove regex functionality from rbcrun
As a first step to making .rbc files compatible with bazel,
remove regex support since bazel doesn't have it.

Fixes: 227384703
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I8b946c20cc42897a47a5516a167732f4e16b6158
2022-03-30 12:00:15 -07:00