Commit graph

56361 commits

Author SHA1 Message Date
Ivan Lozano
a6c6629935 Merge "rust: Don't append '.vendor' to vendor modules." am: dc46c6dcbb am: f6cd4e10dc am: 37aa3f6f50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062447

Change-Id: Idbc7c92adbff2b458d5655347b7a5155ee2de4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 14:31:28 +00:00
Ivan Lozano
37aa3f6f50 Merge "rust: Don't append '.vendor' to vendor modules." am: dc46c6dcbb am: f6cd4e10dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062447

Change-Id: Ibbc3c6d8531f5f45d2efa6ce8b6e249deaf04dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 14:11:09 +00:00
Ivan Lozano
f6cd4e10dc Merge "rust: Don't append '.vendor' to vendor modules." am: dc46c6dcbb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062447

Change-Id: Ibd9bf52d6d76f06fbb14213a083d7e31880772eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 13:46:28 +00:00
Ivan Lozano
dc46c6dcbb Merge "rust: Don't append '.vendor' to vendor modules." 2022-04-13 12:53:52 +00:00
Colin Cross
8823526801 sbox: fix typo when comparing files am: fa8e9cc3a1 am: 898ed6d7f0 am: 146bba0781
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063167

Change-Id: Ic615a394a184840cc0563eca3d68f7728839cf2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 07:29:00 +00:00
Colin Cross
146bba0781 sbox: fix typo when comparing files am: fa8e9cc3a1 am: 898ed6d7f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063167

Change-Id: Ib03bc81b4748c53e9322c3cd499dc53e54049a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 07:06:07 +00:00
Colin Cross
898ed6d7f0 sbox: fix typo when comparing files am: fa8e9cc3a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2063167

Change-Id: I1487c414e1b2b15cd6ecee37937392f4457c0098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 06:42:55 +00:00
Colin Cross
4a43ba755a symbols_map: allow unexpected EOF in ELF files am: 338df53621 am: b9f5de22b8 am: 961216b90f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2061530

Change-Id: Ib395d221098923e6c44941fe2289ac7d3918cef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 01:28:09 +00:00
Colin Cross
961216b90f symbols_map: allow unexpected EOF in ELF files am: 338df53621 am: b9f5de22b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2061530

Change-Id: I6dd3c5cfddf00cb3539e688a0e9682fb9d3c7e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 01:08:17 +00:00
Colin Cross
b9f5de22b8 symbols_map: allow unexpected EOF in ELF files am: 338df53621
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2061530

Change-Id: I8bed49eca885c01e8312bf1560033d4f002c45fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:43:55 +00:00
Colin Cross
fa8e9cc3a1 sbox: fix typo when comparing files
A typo caused one of the two files to be compared to itself if they
both had the same size.

Bug: 228496289
Test: Test_filesHaveSameContents
Change-Id: Ie44f32e3c9b8ef725f0d9933c7e701340036710a
2022-04-13 00:28:32 +00:00
Treehugger Robot
9bad6061fb Merge "Remove implementation details from stub flags in sdk snapshot" am: 03f951d026 am: bd5971349d am: 54bbc2a41e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056470

Change-Id: Id015abe20918c741d01e6df7889ca7dc9e82f5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 21:50:18 +00:00
Treehugger Robot
54bbc2a41e Merge "Remove implementation details from stub flags in sdk snapshot" am: 03f951d026 am: bd5971349d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056470

Change-Id: Ibed19c2f93ed0c835743b80bc5bc84dc71e59669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 21:27:17 +00:00
Colin Cross
338df53621 symbols_map: allow unexpected EOF in ELF files
Some of the prebuilt ELF files used for bionic heads cause an
unexpected EOF error, ignore unexpected EOF the same way we do
for EOF.

Test: not yet
Change-Id: I267d11b4d12b83ecebedc72a565e148c5e53af6d
2022-04-12 21:18:09 +00:00
Jiyong Park
bdd748835c Merge "Remove apex10000_private variants" am: 9c58a3628b am: 74810ac14d am: 81de76843f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062048

Change-Id: I35154eb0d2c5071a5ae5fe9e3b93e821dbe7ac64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 21:00:17 +00:00
Treehugger Robot
bd5971349d Merge "Remove implementation details from stub flags in sdk snapshot" am: 03f951d026
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056470

Change-Id: I719840a326ceffb3f33d131244b32334ca6b8cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 20:42:17 +00:00
Jiyong Park
81de76843f Merge "Remove apex10000_private variants" am: 9c58a3628b am: 74810ac14d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062048

Change-Id: I67ef6b50faeaae037b1aa697917b1108dc008fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 20:26:21 +00:00
Treehugger Robot
03f951d026 Merge "Remove implementation details from stub flags in sdk snapshot" 2022-04-12 20:21:05 +00:00
Jiyong Park
74810ac14d Merge "Remove apex10000_private variants" am: 9c58a3628b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062048

Change-Id: I1d14281b9c06996840610724fbe3429bc7489478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 20:02:20 +00:00
Jiyong Park
9c58a3628b Merge "Remove apex10000_private variants" 2022-04-12 19:37:57 +00:00
Ivan Lozano
f1868af5d5 rust: Don't append '.vendor' to vendor modules.
Rust vendor-only modules would have the '.vendor' subname appended to
them, which meant that 'm <vendor_module>' would not work -- instead
you would need to call 'm <vendor_module>.vendor', which leads to some
confusion.

This CL fixes the behavior by using the same SubName logic as the cc
module.

Bug: 205577906
Test: m <vendor_module> # works without .vendor suffix
Change-Id: I6ba18ce1d7281a1f8342ed6014644b48009d78e0
2022-04-12 13:42:04 -04:00
Paul Duffin
bd88c882f6 Remove implementation details from stub flags in sdk snapshot
Previously, the build applied the same filtering to remove
implementation details from the sdk snapshot's stub-flags.csv file as
it did for its all-flags.csv, i.e. removing the signatures that only
had a "blocked" flag. Unfortunately, that had no effect on the stub
flags as the implementation signatures had no flags, not a single
blocked flag. That meant that the sdk snapshot's
filtered-stub-flags.csv file contained a lot of implementation details.

This change removes signatures from stub-flags.csv that have no flags
which removes all implementation details from the sdk snapshot.

Bug: 194063708
Test: atest --host verify_overlaps_test
      m out/soong/hiddenapi/hiddenapi-flags.csv
      m art-module-sdk
      # Check contents of its filtered-stub-flags.csv file
Change-Id: I30edc77348fad118ea732e787ae8e206c8841f84
2022-04-12 17:44:15 +01:00
David Goldsmith
4248d7bc8b Merge "Add metrics to expconfigfetcher call" am: c21015a0de am: 5ade358eff am: 41e31a3bdf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059887

Change-Id: I2d69aba508fefd7dbd0d8c97107bcd65ec556073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:13:30 +00:00
David Goldsmith
41e31a3bdf Merge "Add metrics to expconfigfetcher call" am: c21015a0de am: 5ade358eff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059887

Change-Id: I7d0f7092c46cd8851f0da5ddb540600b23aca197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 13:58:06 +00:00
David Goldsmith
5ade358eff Merge "Add metrics to expconfigfetcher call" am: c21015a0de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059887

Change-Id: Ifd621c6c31fb9e6aabc2b282e3c08daf68bba264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 13:35:01 +00:00
David Goldsmith
c21015a0de Merge "Add metrics to expconfigfetcher call" 2022-04-12 13:12:08 +00:00
Alex Hong
a0012d1386 Merge "Add android.hardware.dumpstate-V1-ndk to vndkMustUseVendorVariantList" into tm-dev 2022-04-12 04:43:27 +00:00
Jiyong Park
d4a0063d3e Remove apex10000_private variants
When a library is included in two APEXes whose platform_apis settings
are different, two apex variants of the library is created: apex1000 and
apex1000_private.

This change was introduced with ag/15061306, especially by the commit
[1].

However, that part should be reverted because it actually creates
unnecessary variants. It's unnecessary because the two variants of the
library are compiled (excluding the linking) exactly the same. If a
private symbol of its dependency was actually used when compiling the
apex1000_private variant, then the other apex1000 variant wouldn't have
been built because that private symbol must have caused a linkage error.

[1] https://googleplex-android-review.git.corp.google.com/c/platform/build/soong/+/15061306/2..4/android/apex.go#b527).

Bug: 228785792
Test: m
Change-Id: Id58d3e98a51de5e628ca72ef86e9cd11b0ee8971
2022-04-12 12:23:20 +09:00
Colin Cross
6bfe9bc4fa Merge changes I046d75db,Ie13817dc am: d2aa190bdc am: f2c86c8c76 am: 1a3ea67458
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2058908

Change-Id: I9ab91976903abbb4e3ec17b3d26db15447f074d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 00:58:51 +00:00
Colin Cross
1a3ea67458 Merge changes I046d75db,Ie13817dc am: d2aa190bdc am: f2c86c8c76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2058908

Change-Id: Id2e528bb65a943ea59e9b74d936d961aee6e125f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 00:08:09 +00:00
Colin Cross
f2c86c8c76 Merge changes I046d75db,Ie13817dc am: d2aa190bdc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2058908

Change-Id: Ia6f464f84187a7519c2123a7d0e01dae4544efa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 23:43:26 +00:00
Colin Cross
d2aa190bdc Merge changes I046d75db,Ie13817dc
* changes:
  Don't panic if no certificates found
  Move proguard test files to java package
2022-04-11 23:24:06 +00:00
David Goldsmith
62243a3691 Add metrics to expconfigfetcher call
Tracks the time to call the expconfigfetcher and whether it updated the
config file or not.

Test:
Ran a build with a "regular" user and verified the metrics indicated
NO_CONFIG and no config file was created.
Ran a build with an "experiment" user and verified the metrics indicated
CONFIG and a googler.json config file was created.

Bug: http://b/227186589
Change-Id: I030e9497c369459ae98c0c4f7765aef6de4c601f
2022-04-11 21:24:03 +00:00
Alix Espino
cba065beb2 Merge "moved comment to describe Afdo bool" am: 8c81305c80 am: dc338ac418 am: 3b4e9c6bef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057880

Change-Id: I3b6843c7874230df31d5727a40dc0e61bd6df3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:35:27 +00:00
Alix Espino
3b4e9c6bef Merge "moved comment to describe Afdo bool" am: 8c81305c80 am: dc338ac418
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057880

Change-Id: I9d5c35fe5050c62143fff012ea81bd0dcb4e5197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:11:58 +00:00
Alix Espino
dc338ac418 Merge "moved comment to describe Afdo bool" am: 8c81305c80
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057880

Change-Id: Ib42a263a8bed6bde3ba39447a0a066aeb3610c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 19:37:58 +00:00
Alix Espino
8c81305c80 Merge "moved comment to describe Afdo bool" 2022-04-11 19:16:28 +00:00
Colin Cross
412436f7fe Don't panic if no certificates found
Getting the first certificate will panic if there are no certificates,
which can happen when AllowMissingDependencies is set and the
certificate property is a module reference to a missing module.
Only get the first certificate if the list is not nil.

Bug: 228379411
Test: TestAppMissingCertificateAllowMissingDependencies
Change-Id: I046d75dbbd4f21f4a2b6851f558e430e9879fcff
2022-04-11 11:50:34 -07:00
Colin Cross
abc0dab477 Move proguard test files to java package
The proguard test files are duplicated in apex and sysprop and will
be needed by app tests, move them to the java package.

Test: run all soong tests
Change-Id: Ie13817dcda8d98801d16a97ffceef1100c7d5380
2022-04-11 11:44:32 -07:00
Albert Martin
64fdfee038 [automerger skipped] Merge "Flag to globally override apexes' min_sdk_version" am: 26ef058655 am: 5dddca08bd am: 09981b0393 -s ours
am skip reason: Merged-In Ide7d3f2bc772ac6240f1c917b87285d051d6f605 with SHA-1 55ccba2f61 is already in history

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

Change-Id: I3b6e51904348a39cd04ce122737f6a07905e67ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 13:38:47 +00:00
Albert Martin
09981b0393 Merge "Flag to globally override apexes' min_sdk_version" am: 26ef058655 am: 5dddca08bd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059889

Change-Id: I50a5d103898fdf5d22d775e87e092b2f97038a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 13:17:55 +00:00
Albert Martin
5dddca08bd Merge "Flag to globally override apexes' min_sdk_version" am: 26ef058655
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2059889

Change-Id: I4f5470ca60bf95a9766c58b31a4cbfa9c52f9099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 12:48:42 +00:00
Albert Martin
26ef058655 Merge "Flag to globally override apexes' min_sdk_version" 2022-04-11 12:29:09 +00:00
Treehugger Robot
0bd019264a Merge "convert logtags in java srcs" am: b6e1614272 am: af8e9c73e6 am: 311f9a2c99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042847

Change-Id: I579eb834bd7481c5d819d2f469e663018aad09a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 23:49:41 +00:00
Treehugger Robot
311f9a2c99 Merge "convert logtags in java srcs" am: b6e1614272 am: af8e9c73e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042847

Change-Id: Ifb620a0dc2c6077f800ce9a8e587a1f8ee2484ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 23:27:24 +00:00
Treehugger Robot
af8e9c73e6 Merge "convert logtags in java srcs" am: b6e1614272
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042847

Change-Id: I65b70f5592f8c3f2cfbb5158d3b68bad4502a117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:58:07 +00:00
Treehugger Robot
b6e1614272 Merge "convert logtags in java srcs" 2022-04-08 22:37:22 +00:00
Alix
40216ae88b moved comment to describe Afdo bool
Test: just added a comment, no tests performed.

Change-Id: Id921b808462600e889ee8fda532a3305821692b2
2022-04-08 18:57:30 +00:00
Treehugger Robot
db5170fb8d Merge "Add the handle to artifact path requirement functions" am: 19da477d4d am: 3258cf45ec am: 6243bf5ca4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2035363

Change-Id: I3347f31365707564cb18b390af2478c3e6559d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:37:19 +00:00
Treehugger Robot
759f5a25a6 Merge changes from topic "export-vars" am: a2a7b57924 am: 066a777c15 am: fefe3547a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044966

Change-Id: I3f71b23b335baa61b0b997e454d900a8e914c549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:36:58 +00:00