Commit Graph

50151 Commits

Author SHA1 Message Date
Treehugger Robot
2f624bc824 Merge "bp2build supports arch variant srcs for java_library" am: 7db79508c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1989486

Change-Id: I2531377e68be1194e643f3f3958d26a2230965aa
2022-03-14 17:36:29 +00:00
Treehugger Robot
7db79508c7 Merge "bp2build supports arch variant srcs for java_library" 2022-03-14 17:06:01 +00:00
Pirama Arumuga Nainar
921a3a9bdb Merge "[rust] Add path for coverage tests to allowed list" am: f1346fce85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2017599

Change-Id: Iff2189ce5c78b258a9d9b47d3adf2e5abe5e0f7d
2022-03-14 16:40:22 +00:00
Pirama Arumuga Nainar
f1346fce85 Merge "[rust] Add path for coverage tests to allowed list" 2022-03-14 16:11:22 +00:00
Paul Duffin
65849ccb3c Merge "Extract Node superclass of Leaf and InteriorNode" am: 1917c84dd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020737

Change-Id: I86fbae21ad32a690a9bcc55dfe9f425b34b783bf
2022-03-14 15:45:52 +00:00
Paul Duffin
ba66f8e388 Merge "Extract signature_trie.py from verify_overlaps.py" am: e25815954d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020736

Change-Id: Ibd4a3713b0759ab63190e0e72d706b271256a83f
2022-03-14 15:45:42 +00:00
Paul Duffin
1917c84dd6 Merge "Extract Node superclass of Leaf and InteriorNode" 2022-03-14 15:26:19 +00:00
Paul Duffin
e25815954d Merge "Extract signature_trie.py from verify_overlaps.py" 2022-03-14 15:26:06 +00:00
Treehugger Robot
1010e84d04 Merge "Simplify and correct variable assignments" am: 8af3a5a38d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2019417

Change-Id: I8603c4c963ee703a4e827952138a7a195dbc51a5
2022-03-11 02:53:07 +00:00
Treehugger Robot
8af3a5a38d Merge "Simplify and correct variable assignments" 2022-03-11 02:32:11 +00:00
Treehugger Robot
1574c4ab43 Merge "add type to modules created by LoadHookContext" am: 1785c88a4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2018257

Change-Id: I7f24bbc6b4aa55f65b0f56fb132e74d011e2085e
2022-03-11 00:03:22 +00:00
Treehugger Robot
1785c88a4f Merge "add type to modules created by LoadHookContext" 2022-03-10 23:37:08 +00:00
Cole Faust
e2a37988ff Simplify and correct variable assignments
- Remove asgnMaybeAppend, it was only used to indicate
  that the asignment needs a setDefault. But really, all
  types of variable assignments need setDefault if they're
  self-referential.
- Remove local_append/local_set_default because there was
  no implementation for them written in product_config.rbc
  anyways.
- Correct productConfigVariable.emitDefined using the global
  variables instead of the product config variables.
- Emit setDefaults for all types of assignments if they're
  self referential.

Bug: 222737841
Test: go test
Change-Id: I06a0f90f16d5900049d473281e6d5ef5e93e67da
2022-03-10 15:00:57 -08:00
Sam Delmerico
286bf26c2c add type to modules created by LoadHookContext
Modules created by a LoadHookContext do not currently set a module type
when creating new modules, but it would make analysis of the
module-graph.json much easier if this module type information was available.

Bug: 174879786
Test: m json-module-graph && check that module which previously had a
    blank module type now have the field populated
Change-Id: I3be5d259694a1540d21deb8a665ec7bea3464054
2022-03-10 20:59:45 +00:00
Treehugger Robot
23a4c2b1f4 Merge "Suppress ChangedDefault (in another location)" am: 1571419fab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2018296

Change-Id: Ib930e1016c5a5905fad2e5bbbde86c6e51ac2409
2022-03-09 22:26:23 +00:00
Treehugger Robot
1571419fab Merge "Suppress ChangedDefault (in another location)" 2022-03-09 22:00:44 +00:00
Sam Gilbert
28e41289fb Suppress ChangedDefault (in another location)
Change-Id: I71fe558bd379818e254bb031a6a8dc855bb8235d
Test: N/A
Bug: 223382732
2022-03-09 17:01:29 +00:00
Colin Cross
6d21a821d1 Merge changes Iac0f4ca9,I4a56efb2 am: ce73506a85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2017057

Change-Id: I263aacb555dbbd9047910100ce8e2fbb131fd478
2022-03-09 16:07:44 +00:00
Paul Duffin
1f8a6b2f27 Extract Node superclass of Leaf and InteriorNode
Adds a Node superclass to declare and documented the methods that need
to be implemented by Leaf and InteriorNode. Also uses @dataclasses to
make it easy to declare and document the properties of each class.

This refactoring is in preparation for future changes that will need to
add common behavior to both Leaf and InteriorNode so having a
superclass will make that easier.

Bug: 202154151
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      atest --host signature_trie_test verify_overlaps_test
      pyformat -s 4 --force_quote_type double -i scripts/hiddenapi/signature_trie*
      /usr/bin/pylint --rcfile $ANDROID_BUILD_TOP/tools/repohooks/tools/pylintrc scripts/hiddenapi/signature_trie*
Change-Id: If660855f6b1f45a8ea5b90b3cc0236da9e07d090
2022-03-09 15:43:57 +00:00
Colin Cross
ce73506a85 Merge changes Iac0f4ca9,I4a56efb2
* changes:
  Support BUILD_HOST_static=1 for musl and linux_bionic builds
  Support building python pars against static or shared musl libc
2022-03-09 15:40:26 +00:00
Paul Duffin
b5cd522053 Extract signature_trie.py from verify_overlaps.py
Makes the efficient pattern matching of hidden API flags that is used
by verify_overlaps.py available for use in other scripts.

As part of the move this cleans up the python to use consistent quotes,
and fix pylint issues.

Bug: 202154151
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
      atest --host signature_trie_test verify_overlaps_test
      pyformat -s 4 --force_quote_type double -i scripts/hiddenapi/signature_trie*
      /usr/bin/pylint --rcfile $ANDROID_BUILD_TOP/tools/repohooks/tools/pylintrc scripts/hiddenapi/signature_trie*
Change-Id: I758ca70bb5b7e6806f14b72fd04f821a069f188f

Change-Id: I73fdb7e02127a8c0171a285221d9e6024310953d
2022-03-09 14:04:23 +00:00
Pirama Arumuga Nainar
fac98b5c8e [rust] Add path for coverage tests to allowed list
Bug: http://b/214396112

The goal is to run this smoke test in presubmit on all platform changes.

Test: build with aosp/
Change-Id: I4abb7f46905bd4160a2d628be2761874df6b1b34
2022-03-08 23:08:33 -08:00
Colin Cross
40341f2b0b Merge "Add host_linux target properties" am: 5ffb223ebb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2012436

Change-Id: Ie20b02a46feed29c8ae26bf7312618375a195369
2022-03-09 02:37:31 +00:00
Colin Cross
5ffb223ebb Merge "Add host_linux target properties" 2022-03-09 02:05:38 +00:00
Cole Faust
ea87fe8d35 Merge "Call rblf.setDefault() when appending to a variable without +=" am: 7d49b1e70a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2009377

Change-Id: I4f6097272ee5c781452e17c81c133f3c2163770a
2022-03-08 23:26:51 +00:00
Colin Cross
7e2092a274 Support BUILD_HOST_static=1 for musl and linux_bionic builds
BUILD_HOST_static=1 is useful for musl and linux_bionic builds to
produce standalone static binaries.

Bug: 179809553
Test: m USE_HOST_MUSL=true BUILD_HOST_static=1 apexer deapexer
Change-Id: Iac0f4ca92c3ffb27bccd4cac15a6ef9fa5924471
2022-03-08 15:15:56 -08:00
Colin Cross
4111c52fa2 Support building python pars against static or shared musl libc
Support building python pars against musl libc by either adding
libc_musl as an install dependency or using the static version
of the python launchers.

Bug: 179809553
Test: m USE_HOST_MUSL=true apexer deapexer
Test: m USE_HOST_MUSL=true BUILD_HOST_static=true apexer deapexer
Change-Id: I4a56efb227bea746836eb785d929eb4b5d8e15f1
2022-03-08 15:15:56 -08:00
Cole Faust
7d49b1e70a Merge "Call rblf.setDefault() when appending to a variable without +=" 2022-03-08 22:58:58 +00:00
Cole Faust
816e080c4d Call rblf.setDefault() when appending to a variable without +=
Bug: 222737841
Test: go test
Change-Id: I10e9e994fb1979e2e06ad30bbe66a21657d1e3db
2022-03-08 22:58:42 +00:00
Treehugger Robot
61ebc18fd5 Merge "Disable ChangedDefault" am: 4a5110f046
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2015695

Change-Id: Iacfe840e93156c0f5a70547e9fa94d92cdf4008d
2022-03-08 21:36:04 +00:00
Treehugger Robot
5837c6434c Merge "Support variables with dashes in their names" am: 28080ea3b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2002775

Change-Id: Iafc44854528f6e9bd16d4787d25c8e250261df55
2022-03-08 21:35:44 +00:00
Treehugger Robot
4a5110f046 Merge "Disable ChangedDefault" 2022-03-08 21:15:44 +00:00
Treehugger Robot
28080ea3b0 Merge "Support variables with dashes in their names" 2022-03-08 21:08:09 +00:00
Treehugger Robot
849a844f04 Merge changes from topic "vsdk_ramdisk" am: 86ac783d8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2012416

Change-Id: I6db573110f28c6a1250e2ce23e042d19f4bc0bec
2022-03-08 17:37:43 +00:00
Treehugger Robot
86ac783d8e Merge changes from topic "vsdk_ramdisk"
* changes:
  Add InstallInRoot property to snapshot binary json file.
  Fix for duplicate modules across vendor and ramdisk snapshots.
2022-03-08 17:10:54 +00:00
Andrew Walbran
fb210706de Merge "Add stdlibs property for Rust build rules." am: 1e17a78c55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2010758

Change-Id: I334123471c5877ad6afec6a5834af6a43e043817
2022-03-08 16:34:25 +00:00
Sam Gilbert
675f0b41be Disable ChangedDefault
Bug: 223382732
Test: N/A
Change-Id: I45b70824650544b465fa656cb09983bf90f923b6
2022-03-08 11:24:44 -05:00
Andrew Walbran
1e17a78c55 Merge "Add stdlibs property for Rust build rules." 2022-03-08 16:07:16 +00:00
Romain Jobredeaux
55b5ac1221 Merge "Add source extension information for java_*/android_* modules in module-graph.json." am: d9eba6611f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875414

Change-Id: Ib30550f8dd6ab118ba0e55790f4c3bb81d054d9c
2022-03-08 15:21:39 +00:00
Romain Jobredeaux
d9eba6611f Merge "Add source extension information for java_*/android_* modules in module-graph.json." 2022-03-08 14:52:17 +00:00
Paul Duffin
efa9bd7422 Merge "List bootclasspath_fragments in module-info.json" am: d94e4f5554
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2007227

Change-Id: Id0ab2729a636dbe0654d4219fa0dfd0f39a61319
2022-03-08 12:22:04 +00:00
Paul Duffin
d94e4f5554 Merge "List bootclasspath_fragments in module-info.json" 2022-03-08 11:50:54 +00:00
Jingwen Chen
1b85e8db34 Merge "Allowlist //external/auto/android-annotation-stubs for bp2build." am: 3889da5fea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2015115

Change-Id: I4b4a01ffa3e68046c808ae38b5ae883ae38eb237
2022-03-08 11:19:54 +00:00
Jingwen Chen
3889da5fea Merge "Allowlist //external/auto/android-annotation-stubs for bp2build." 2022-03-08 10:55:49 +00:00
Ulya Trofimovich
fc95ba48b0 Merge "Add markdown docs for dexpreopt." am: 6a71babc48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2006791

Change-Id: I066ff26b1172c413885bf8e9c43c533be0e2f20c
2022-03-08 10:38:50 +00:00
Xin Li
8ee748f07d [automerger skipped] Merge "Merge Android 12L" am: c7c0b9e4ec -s ours
am skip reason: Merged-In I3b9c8a3d4d36cc03b6648b2c7a7b5a10706ec87d with SHA-1 97fe2742b7 is already in history

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

Change-Id: I9236b190c22a9433545d581a4ad3e1c52d2d37cb
2022-03-08 10:21:53 +00:00
Xin Li
bb872ccd7b [automerger skipped] Merge Android 12L am: a54e05c20f -s ours
am skip reason: Merged-In I3b9c8a3d4d36cc03b6648b2c7a7b5a10706ec87d with SHA-1 97fe2742b7 is already in history

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

Change-Id: Ia5174b9e0f6bf9b98631bb8ef4fa8f91fc68724f
2022-03-08 10:19:01 +00:00
Ulya Trofimovich
6a71babc48 Merge "Add markdown docs for dexpreopt." 2022-03-08 10:05:44 +00:00
Jingwen Chen
398a32d9b0 Allowlist //external/auto/android-annotation-stubs for bp2build.
Fixes breakage for bp2build-incremental.

Test: b build //external/...
Change-Id: Id493c119b6ba0f383c9d1e8bade8b8a0acf3efe6
2022-03-08 08:03:28 +00:00
Colin Cross
9e08d692cc Merge "Use single module for clang runtime libraries" am: 3c66771c62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980451

Change-Id: I70d758c3bf121aac8f00fccf2ac6fbbb7fe0f55e
2022-03-08 07:30:17 +00:00