Commit graph

78686 commits

Author SHA1 Message Date
Treehugger Robot
e7951493a1 Merge "Fix single value variable inheritance order" am: 52233be25c
Original change: https://android-review.googlesource.com/c/platform/build/+/2054306

Change-Id: I85c48e5a65f29de320e3da046f83acea2a1654cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 21:59:18 +00:00
Treehugger Robot
52233be25c Merge "Fix single value variable inheritance order" 2022-04-05 21:34:26 +00:00
Colin Cross
92ead00c5c Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" am: cba35df61b am: e662f2e4db am: 1a652183f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2055033

Change-Id: I519ae7270d3b279230ce890e64de475fafa24820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 20:44:54 +00:00
Treehugger Robot
4e72e7557f Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c36a am: 83cd363614 am: 7a1cca449f
Original change: https://android-review.googlesource.com/c/platform/build/+/2055109

Change-Id: I32e8c53f9dfd4f7e2dd5edccaf118fec9a513f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 20:44:35 +00:00
Colin Cross
1a652183f3 Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" am: cba35df61b am: e662f2e4db
Original change: https://android-review.googlesource.com/c/platform/build/+/2055033

Change-Id: I45047c52911af2b0d829672a99f1a2f2faa7b776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 20:13:03 +00:00
Treehugger Robot
7a1cca449f Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c36a am: 83cd363614
Original change: https://android-review.googlesource.com/c/platform/build/+/2055109

Change-Id: I7c1f40c59653e3c2cd9cb7a76bbbfe4256b4da0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 20:11:36 +00:00
Colin Cross
e662f2e4db Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" am: cba35df61b
Original change: https://android-review.googlesource.com/c/platform/build/+/2055033

Change-Id: I28b3b2e9de7f5ec04abfb52a51e8971e4c569859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 19:56:30 +00:00
Treehugger Robot
83cd363614 Merge "prevent unintended m bp2build "" when running b" am: 54dbc8c36a
Original change: https://android-review.googlesource.com/c/platform/build/+/2055109

Change-Id: I654dd587a07486f03d8ab1aa761c1f972e3fada1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 19:47:47 +00:00
Colin Cross
cba35df61b Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" 2022-04-05 17:53:24 +00:00
Colin Cross
59ecb9e016 Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"
This reverts commit 3570b3ed86.

Reason for revert: b/228195288

Bug: 218888599
Change-Id: I17b38ca1b6f8940d682f2782515bfd5f8db1ce58
2022-04-05 17:47:27 +00:00
Treehugger Robot
54dbc8c36a Merge "prevent unintended m bp2build "" when running b" 2022-04-05 17:45:08 +00:00
Trevor Radcliffe
b2b968ec6d Merge "Make changes to support test_suites for test lib" am: f190db2a0c am: 0eaf156a31 am: 0cbaeda125
Original change: https://android-review.googlesource.com/c/platform/build/+/2051889

Change-Id: I66bb26bb21ea928b28e5f52026b56fb43606bfa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 16:30:04 +00:00
Trevor Radcliffe
6bb8a1ad22 Add comment for previous CL
Let people know why why change 2051889 was created

Bug: 226402757
Test: N/A
Change-Id: I57cfa6382805aa20e2a905936d63ffaec6c3c236
2022-04-05 16:29:18 +00:00
Trevor Radcliffe
0cbaeda125 Merge "Make changes to support test_suites for test lib" am: f190db2a0c am: 0eaf156a31
Original change: https://android-review.googlesource.com/c/platform/build/+/2051889

Change-Id: If3544c3b920cd68cb5cf4759f9785f67bc8e6681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 16:11:09 +00:00
Sam Delmerico
b6fe473734 change logtags dependency to provide java sources
This rule originally used an android_library because it needed access to
SDK methods, but we can instead just provide Java sources and expect the
dependee to link the SDK methods.

Test: enabled QuickSearchBox and build
Change-Id: I7f1cdbea49e100ecc0944f8caa39683fb73016fb
2022-04-05 16:06:46 +00:00
Trevor Radcliffe
0eaf156a31 Merge "Make changes to support test_suites for test lib" am: f190db2a0c
Original change: https://android-review.googlesource.com/c/platform/build/+/2051889

Change-Id: I49ddf54d1edbd5a921da6df6060988f2126159cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 15:54:59 +00:00
Trevor Radcliffe
f190db2a0c Merge "Make changes to support test_suites for test lib" 2022-04-05 15:34:53 +00:00
Colin Cross
d651900385 Merge "Produce mappings of hashes to elf symbols and r8 dictionaries" am: 229fb33e39 am: 47e2aed61d am: 25681b47af
Original change: https://android-review.googlesource.com/c/platform/build/+/2035523

Change-Id: I6a9fd470c2bece57a6be2eec7be4156a59ff63bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 15:28:29 +00:00
Colin Cross
25681b47af Merge "Produce mappings of hashes to elf symbols and r8 dictionaries" am: 229fb33e39 am: 47e2aed61d
Original change: https://android-review.googlesource.com/c/platform/build/+/2035523

Change-Id: I437de9a6adac586a18e40941be0215e49f9e7928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 15:00:17 +00:00
Colin Cross
47e2aed61d Merge "Produce mappings of hashes to elf symbols and r8 dictionaries" am: 229fb33e39
Original change: https://android-review.googlesource.com/c/platform/build/+/2035523

Change-Id: I34ea998f92e1d744831a5209792f2db75f319d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 14:39:39 +00:00
Colin Cross
229fb33e39 Merge "Produce mappings of hashes to elf symbols and r8 dictionaries" 2022-04-05 14:16:16 +00:00
Sam Delmerico
89a4702555 prevent unintended m bp2build "" when running b
cl/2045666 allowed the --skip-soong-tests flag to pass through
invocations of the `b` command to soong_ui. But when the flag was
missing, an extra `""` argument was passed instead which caused soong_ui
to invoke a build of the droid target.

Test: m clean && b build '...'  # verify Soong does not run a build
Change-Id: I7b99437d225786eb1698a88d0c755ce897550e70
2022-04-05 13:47:32 +00:00
Orion Hodson
8208530fa6 Merge "Update checkowners.py to support python3" am: 2f4e021780 am: 982f400a15 am: 6542d0fcf5
Original change: https://android-review.googlesource.com/c/platform/build/+/2053986

Change-Id: Id917b37ad4d5aefcbc42baa2a9108a2d6899a0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 11:22:03 +00:00
Orion Hodson
6542d0fcf5 Merge "Update checkowners.py to support python3" am: 2f4e021780 am: 982f400a15
Original change: https://android-review.googlesource.com/c/platform/build/+/2053986

Change-Id: I693d2723ea12bf1744d328248e92562626f3fb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 10:06:37 +00:00
Orion Hodson
982f400a15 Merge "Update checkowners.py to support python3" am: 2f4e021780
Original change: https://android-review.googlesource.com/c/platform/build/+/2053986

Change-Id: I2ab99b872cdce1486a00ea805f644bf1e4282fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 08:43:44 +00:00
Orion Hodson
2f4e021780 Merge "Update checkowners.py to support python3" 2022-04-05 08:22:38 +00:00
Treehugger Robot
b9600415f5 Merge "Support more dependencies for license metadata." am: d17518474a am: e13c9771a6 am: c8e5998100
Original change: https://android-review.googlesource.com/c/platform/build/+/2043296

Change-Id: If82e7222c2d8ee7fc850d7d8c4c1b218d9b91a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 01:57:20 +00:00
Treehugger Robot
c8e5998100 Merge "Support more dependencies for license metadata." am: d17518474a am: e13c9771a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2043296

Change-Id: I0c64006c5bb8044b64de79196475a9ae2dee70f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 01:30:03 +00:00
Treehugger Robot
e13c9771a6 Merge "Support more dependencies for license metadata." am: d17518474a
Original change: https://android-review.googlesource.com/c/platform/build/+/2043296

Change-Id: I0848b4b15098e04242ec32147bbb885a461356d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 01:06:22 +00:00
Treehugger Robot
d17518474a Merge "Support more dependencies for license metadata." 2022-04-05 00:22:12 +00:00
Colin Cross
3570b3ed86 Produce mappings of hashes to elf symbols and r8 dictionaries
Run the symbols_map tool on each unstripped binary and proguard
dictionary while copying it to produce a textproto that maps the
hash to the symbol/dictionary file location.  Combine the textprotos
into a mapping file when producing the zipped build artifacts.

Bug: 218888599
Test: m dist
Change-Id: I78997e2f3b631ed74213903cc8e72415b2d7eee0
2022-04-04 16:04:52 -07:00
Treehugger Robot
29131c2f2a Merge "Make dir work on multiple paths" am: cd2eca27f7 am: 626335b726 am: 59b9e47ea8
Original change: https://android-review.googlesource.com/c/platform/build/+/2053130

Change-Id: I84c66a79288d7bbad5ece24310d833c889022ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 22:59:50 +00:00
Treehugger Robot
59b9e47ea8 Merge "Make dir work on multiple paths" am: cd2eca27f7 am: 626335b726
Original change: https://android-review.googlesource.com/c/platform/build/+/2053130

Change-Id: I882902f393da750484972247de1e36680719ea70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 22:38:01 +00:00
Treehugger Robot
626335b726 Merge "Make dir work on multiple paths" am: cd2eca27f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2053130

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

Change-Id: I6ba628c0762035569965f62c3fb07819bb21bb6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 22:16:57 +00:00
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
Orion Hodson
e421668192 Update checkowners.py to support python3
Update generated with 2to3.

Bug: N/A
Test: manually check OWNERS files
Change-Id: Idccc7ba36351854fe2b7a669a99c97f3f3a03d0e
2022-04-04 13:22:38 +01:00
Xin Li
fd2f82d65e [automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: 25e7578344 -s ours am: 72e5ee73d9 -s ours
am skip reason: Merged-In Ib35026f71208afa53f33ee9967cd9acb88a73d0d with SHA-1 c28d43119f is already in history

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

Change-Id: I839cd69251afc171b58f268359585a2aa782e7fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:45:56 +00:00
Xin Li
ea717a3d64 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f36e10b1f9 -s ours am: 4e4d3f87c5 -s ours
am skip reason: Merged-In Ib35026f71208afa53f33ee9967cd9acb88a73d0d with SHA-1 c28d43119f is already in history

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

Change-Id: I104c8b4eed834e5b4f7593bc9be17fe339acceb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:43:52 +00:00
Xin Li
72e5ee73d9 [automerger skipped] Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master am: 25e7578344 -s ours
am skip reason: Merged-In Ib35026f71208afa53f33ee9967cd9acb88a73d0d with SHA-1 c28d43119f is already in history

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

Change-Id: I2a2d61937f57c597ee627d0c5f88fb36aa256394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:13:57 +00:00
Xin Li
4e4d3f87c5 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f36e10b1f9 -s ours
am skip reason: Merged-In Ib35026f71208afa53f33ee9967cd9acb88a73d0d with SHA-1 c28d43119f is already in history

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

Change-Id: Iad9ed4ee839f6ac6371b0300564b3e83a6e09fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:51 +00:00