Commit Graph

50897 Commits

Author SHA1 Message Date
Vinh Tran
6d7f6c7442 Merge "Fix documentation for android_app_import" am: fc5b47e5d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062873

Change-Id: I74ce746d5bca5f4b9a51b2442b2946edfdfa1964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 16:49:59 +00:00
Vinh Tran
fc5b47e5d4 Merge "Fix documentation for android_app_import" 2022-04-14 16:27:18 +00:00
Sam Delmerico
d09556a687 add unit test for bp2build allowlist am: cc51843e52
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047750

Change-Id: I4b5ef2be27f80ba8930ecc3d7d1e9ed0b2ac7165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 16:13:12 +00:00
Sam Delmerico
a9ffab0be2 refactor bp2build module allowlists into struct am: 24c5603815
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047749

Change-Id: I77f64526b7a1600a5e2727e045812c091e243c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 16:13:09 +00:00
Sam Delmerico
cc51843e52 add unit test for bp2build allowlist
Test: go test ./android
Change-Id: I0ea1d97444cbedfd285f1fc4bd7ff246ce699dc9
2022-04-14 13:31:09 +00:00
Sam Delmerico
24c5603815 refactor bp2build module allowlists into struct
To make testing easier, refactor existing module-global variables into a
struct that can be mocked.

Test: build/bazel/bp2build.go
Change-Id: I9d177677644ea743641a745b1839a3a8b29f902a
2022-04-14 13:31:05 +00:00
Vinh Tran
4ae8d4ac46 Fix documentation for android_app_import
Test: N/A
Fix: 226586426
Change-Id: I588a249a85d152f37f5d1bd7157cfab120185648
2022-04-13 21:40:23 +00:00
Ivan Lozano
c07e7e9f3c Merge "rust: set ANDROID_RUST_VERSION based on prebuilts" am: 5e7455996e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2062367

Change-Id: I3604eafdf52480cb6c4ccaea3a5d547d8e4136d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 13:46:38 +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
5e7455996e Merge "rust: set ANDROID_RUST_VERSION based on prebuilts" 2022-04-13 12:56:27 +00:00
Ivan Lozano
dc46c6dcbb Merge "rust: Don't append '.vendor' to vendor modules." 2022-04-13 12:53:52 +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
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
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
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
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
Ivan Lozano
6d14ed157e rust: set ANDROID_RUST_VERSION based on prebuilts
ANDROID_RUST_VERSION is always set to the default Rust version, rather
than than respecting the RUST_PREBUILTS_VERSION setting. This is not the
correct behavior, this CL resolves the issue.

Test: m nothing
Change-Id: I3f8a2fc3590b7313286278b77534bb669cc693d6
2022-04-12 10:29:43 -04: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
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
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
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
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
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
Albert Martin
eefabcf321 Flag to globally override apexes' min_sdk_version
Override all mainline updateable apexes' min_sdk_version
to same version to get single shared native libs on DCLA.

Test: Run "vendor/google/build/go/mainline_go_modules_arm.sh" and inspect built apexes
Bug: 212609891
Change-Id: Ide7d3f2bc772ac6240f1c917b87285d051d6f605
Merged-In: Ide7d3f2bc772ac6240f1c917b87285d051d6f605
2022-04-08 17:51:07 +00:00
Treehugger Robot
3258cf45ec Merge "Add the handle to artifact path requirement functions" am: 19da477d4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2035363

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

Change-Id: If35e6cdd50ecf5c573fa6944780cf52f959c1ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:50:08 +00:00
Treehugger Robot
19da477d4d Merge "Add the handle to artifact path requirement functions" 2022-04-08 17:32:25 +00:00
Treehugger Robot
a2a7b57924 Merge changes from topic "export-vars"
* changes:
  export Java variables to Bazel
  refactor Bazel variable export
2022-04-08 17:31:23 +00:00
Sam Delmerico
24da73c032 convert logtags in java srcs
Some java_* modules contain .logtag files in their srcs, but we should
separate these out into their own targets.

Test: enabled QuickSearchBox and build
Change-Id: I595722ca59686d450ff522987a15ce283d3607e0
2022-04-08 14:43:18 +00:00
Sam Delmerico
932c01cf9e export Java variables to Bazel
Test: build/bazel/bp2build.sh
Change-Id: Ia06f9265c9f96e6add6edbd0cee925fe37b430d3
2022-04-08 14:15:43 +00:00
Paul Duffin
0971c66db1 Merge "Use named options for verify_overlaps" am: 510a5e054d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056469

Change-Id: I6952486297987b68eaf0d9a25693937169499e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 14:04:00 +00:00
Paul Duffin
e977374d90 Merge "Cleanup verify_overlaps*.py" am: 6f041b56a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2056468

Change-Id: I2773f8af41890f7ccf7e7724969d8c5d48e0b521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 14:03:46 +00:00
Paul Duffin
510a5e054d Merge "Use named options for verify_overlaps" 2022-04-08 13:50:17 +00:00
Paul Duffin
6f041b56a2 Merge "Cleanup verify_overlaps*.py" 2022-04-08 13:50:12 +00:00
Liz Kammer
55c3707d03 Merge "Clean up allowlist contents." am: bfc3bd712a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057072

Change-Id: I36d4a00096f5fb2c2e46a929f3c153bdb630b237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 13:34:52 +00:00
Liz Kammer
bfc3bd712a Merge "Clean up allowlist contents." 2022-04-08 13:11:50 +00:00