Commit graph

50769 commits

Author SHA1 Message Date
Colin Cross
f9bc0e5e3e Merge "Add a symbols_map tool for extracting identifiers from elf and r8 files" am: 465a131ac9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2035543

Change-Id: I87ac7e701ad431875a3366f0e0f61ad0eea301de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 14:39:39 +00:00
Colin Cross
465a131ac9 Merge "Add a symbols_map tool for extracting identifiers from elf and r8 files" 2022-04-05 14:16:16 +00:00
Treehugger Robot
ab8f13d074 Merge "Tweak linux_glibc properties for musl builds in build/soong" am: 90b6e70c5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2049204

Change-Id: I77aebc7d9c8f66345facbb4e8bc6d1b403a2c4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 14:03:18 +00:00
Treehugger Robot
90b6e70c5a Merge "Tweak linux_glibc properties for musl builds in build/soong" 2022-04-05 13:39:36 +00:00
Anton Hansson
3969920129 Merge "Remove apex framework jars from hard-coded list" am: 71cf2a3cc6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2054405

Change-Id: Id5808064f45a55b9285e6a7e7a69da793f837264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 11:57:14 +00:00
Paul Duffin
533b7549a9 Merge "analyze_bcpf: Explain why a package is split/single" am: 3f19ffb711
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2054409

Change-Id: If3b61480cfee0dbd4ba27263841144be0f92adc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 11:57:03 +00:00
Anton Hansson
71cf2a3cc6 Merge "Remove apex framework jars from hard-coded list" 2022-04-05 11:46:04 +00:00
Paul Duffin
3f19ffb711 Merge "analyze_bcpf: Explain why a package is split/single" 2022-04-05 11:41:17 +00:00
Paul Duffin
709684da65 Merge "analyze_bcpf: Indent multi-line text to improve formatting" am: b84f1d5bb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2054408

Change-Id: Ic6b2fadfe34bace2b85e36e317f74cad057cd01e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 11:37:00 +00:00
Paul Duffin
9162053927 Merge "signature_trie: Avoid unnecessary wrapping and unwrapping of values" am: ffd5b32aba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2054407

Change-Id: I37a4ce2194fba9e93b10bd0fb029c74b5fe4dbe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 11:36:49 +00:00
Paul Duffin
b84f1d5bb8 Merge "analyze_bcpf: Indent multi-line text to improve formatting" 2022-04-05 11:15:14 +00:00
Paul Duffin
ffd5b32aba Merge "signature_trie: Avoid unnecessary wrapping and unwrapping of values" 2022-04-05 11:14:59 +00:00
Anton Hansson
51bbac2137 Remove apex framework jars from hard-coded list
All apex jars get auto-instrumented since
I2b1c0736202de26c5ea88c0ab14574bd7207a5fb

Test: $ EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true m nothing && \
      $ grep LOCAL_MODULE.*framework-sdkextensions.com.android.sdkext$ \
            out/soong/Android-aosp_coral.mk  -A9 -B2 | grep JACO
Change-Id: I1de5ba6673bef93b16c302412f920d93129d4420
2022-04-05 09:00:57 +00:00
Treehugger Robot
d4a37e0757 Merge "Keep dependency files out of the apk file." am: 5f58c378b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2055425

Change-Id: Ia9294949a298b35791a585c05a5190730cbfb2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 06:10:19 +00:00
Treehugger Robot
5f58c378b6 Merge "Keep dependency files out of the apk file." 2022-04-05 05:53:22 +00:00
Spandan Das
7638a61b2b Merge changes Icb91de93,I5a2edaf4 am: 2430a04b2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2054866

Change-Id: I3238c517906945f5cd969fd52c73ef1f8087b527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 04:26:07 +00:00
Anton Hansson
a01a0bd251 Revert "Relax apex package restriction for T+ jars" am: e1b1836939
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1929447

Change-Id: I30131073a37e2066c5a75962faee2cf2f3b6ce3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 04:26:05 +00:00
Spandan Das
2430a04b2e Merge changes Icb91de93,I5a2edaf4
* changes:
  Change permitted_packages check to be per-jar rather than per-apex
  Revert "Relax apex package restriction for T+ jars"
2022-04-05 04:06:55 +00:00
Bob Badour
2c8888edef Keep dependency files out of the apk file.
Bug: 227682036

Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97

Change-Id: I1a9775af7c652191bb1ce3b97c1cb9365b469c19
2022-04-04 19:21:18 -07:00
Treehugger Robot
94d3cfa385 Merge "Enable int-in-bool-context warning" am: 34f3673f54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2001832

Change-Id: I373a1e43530b85e72309ccaed96eb8c785afd229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 01:42:56 +00:00
Treehugger Robot
34f3673f54 Merge "Enable int-in-bool-context warning" 2022-04-05 01:21:10 +00:00
Colin Cross
36f55aabcd Add a symbols_map tool for extracting identifiers from elf and r8 files
Add a symbols_map tool that can extract an identifiying hash from
and elf file or an r8 dictionary.  The tool writes the hash to a
textproto, and also supports a merge mode to combine textprotos into
a output file for inclusion in the build artifacts.

Bug: 218888599
Test: m dist
Test: symbols_map_test.go
Change-Id: Icd3ed6e5510e058c92d97c78759e7a4cfcdbb6ca
2022-04-04 15:53:38 -07:00
Cole Faust
93fbdba0ff Merge "Correct type of dir function" am: e0762c419f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052146

Change-Id: Id7adc8dd4c7ab566154bc4c6ed4a7f87fc4d1cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 18:17:07 +00:00
Cole Faust
e0762c419f Merge "Correct type of dir function" 2022-04-04 17:53:11 +00:00
Spandan Das
f14e254a28 Change permitted_packages check to be per-jar rather than per-apex
(cherry-pick of ag/17524387 into aosp)

Summary:
- updates the Q and R maps, the new keys are the bcp jars and not the
apexes. neverallow build rules ensure that these bcp jars have a
restricted set of permitted_packages
- remove BootclasspathJar from the neverallow rule. This is no longer
necessary since the keys in the maps are the bootjars themselves, and
not apexes

Bug: 205289292
Test: In build/soong, go test ./apex
Change-Id: Icb91de934181a8b6f085e03a0ce8c5e08504ff94
Merged-In: Icb91de934181a8b6f085e03a0ce8c5e08504ff94
(cherry picked from commit 440ff96728)
2022-04-04 17:42:00 +00:00
Yi Kong
2643d6fff3 Merge "Update to clang-r450784b" am: 07d9ca7de3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2053446

Change-Id: I3fe9263d21d1a65bdfc5c2fb6672fbdfc1520853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 17:38:03 +00:00
Anton Hansson
e1b1836939 Revert "Relax apex package restriction for T+ jars"
This reverts commit 1fdd6ca88a.

Reason for revert: b/205289292 tracks the real fix for this

Test: presubmit
Change-Id: I5a2edaf4f930dafa26659f85d9425e9041c72275
Merged-In: I5a2edaf4f930dafa26659f85d9425e9041c72275
2022-04-04 17:27:43 +00:00
Paul Duffin
b99d480e1d analyze_bcpf: Explain why a package is split/single
Previously, the script would determine whether a package was split,
single or could be used as a prefix but did not explain why. This
change provides additional information to explain why they are split.

Bug: 202154151
Test: m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment
      m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment --fix
      atest --host analyze_bcpf_test
Change-Id: I3e2d5c0b54b5cc028013ce5ea979ebd9b9bf2c0d
2022-04-04 18:24:40 +01:00
Yi Kong
07d9ca7de3 Merge "Update to clang-r450784b" 2022-04-04 17:12:45 +00:00
Treehugger Robot
0050ed2760 Merge "convert java_import jars with arch variants" am: 7a45d37e62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995732

Change-Id: I05420e9a6cff3a8843dd5438b9b73becfaa8698d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 16:25:44 +00:00
Treehugger Robot
7a45d37e62 Merge "convert java_import jars with arch variants" 2022-04-04 16:06:55 +00:00
Paul Duffin
ea836c2baf analyze_bcpf: Indent multi-line text to improve formatting
Addresses a comment on the review of the initial changes to add
analyze_bcpf script.

Bug: 202154151
Test: m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment
      m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment --fix
      atest --host analyze_bcpf_test
Change-Id: I8c030dcc1a29f106ca57dca8c97a5cb4425e7674
2022-04-04 16:59:36 +01:00
TreeHugger Robot
c6affe2f1a Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master 2022-04-03 01:59:54 +00:00
Yi Kong
3f0358bfda Update to clang-r450784b
Test: presubmit
Bug: 219872355
Change-Id: I2ea4855dfcbe9dd297bbd3cf96a451c35038498d
2022-04-03 04:26:03 +08:00
Bob Badour
b0489dec23 Merge "Revert "Revert "Build notice files from license metadata.""" am: 3aae38d451
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051564

Change-Id: I3f2bafea9462d6a6b15bf29884ba64e2353b0627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-02 01:05:50 +00:00
Bob Badour
3aae38d451 Merge "Revert "Revert "Build notice files from license metadata.""" 2022-04-02 00:43:34 +00:00
Xin Li
afb99ffd63 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Ida22f0ccbfc886f741a4c3308027922c47ae0529
Change-Id: I1cc91e6f8db42af9d8ab2ace3b4009ae6a06780d
2022-04-01 20:31:49 +00:00
Cole Faust
0e2b256846 Correct type of dir function
It should return a string, not a list.

Bug: 227245326
Test: go test
Change-Id: If0cb382dede52200c0595ae939a8064641216af1
2022-04-01 11:49:24 -07:00
Ember Rose
f4d7122237 Merge "Rename InvalidNullabilityOverride suppression" am: 1d3b79f78f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051891

Change-Id: I79fd62c8ec90e22162c2fad43f4bab225633ecb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:11:24 +00:00
Bob Badour
de6a087d2d Revert "Revert "Build notice files from license metadata.""
This reverts commit 77807b3c27.

Reason for revert: fix and roll forward again

Change-Id: I80c796ca81ecf29df9522babe54d684a0d11b9e6
2022-04-01 18:00:00 +00:00
Ember Rose
1d3b79f78f Merge "Rename InvalidNullabilityOverride suppression" 2022-04-01 17:53:00 +00:00
Wei Sheng Shih
72f9cdb599 Revert "Build notice files from license metadata." am: 77807b3c27
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052565

Change-Id: I2bfa3e361890734d4ad3725c2ec77a473ba6212e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 16:43:52 +00:00
Ember Rose
7c57af39e5 Rename InvalidNullabilityOverride suppression
Test: N/A
Bug: 227661934
Change-Id: I26fcb5b7de58e8c982054a5a54e3526e0b8be2a2
2022-04-01 10:38:54 -04:00
Wei Sheng Shih
77807b3c27 Revert "Build notice files from license metadata."
This reverts commit 43c2dcaef6.

Reason for revert: suspect build break

Bug: 227682036

Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97


Change-Id: Ibfb8b4fefc264f52f32ba661c269a9cd625d800a
2022-04-01 14:10:53 +00:00
Paul Duffin
dbbb8374a2 signature_trie: Avoid unnecessary wrapping and unwrapping of values
Previously, Leaf.values() and Leaf.append_values() would wrap the
Leaf's value inside a list before appending it to the list of values.
So, the values list was actually a list of lists of values. The
get_matching_rows method would then use chain.from_iterable() to
flatten that list of list of values into a list of values.

This change removes the initial wrapping in a list and so removes the
need to flatten them into a single list. It also adds a test for the
values() method. Prior to this change the expected value would have
been [[1], ["A"], [{}]].

Bug: 202154151
Test: atest --host analyze_bcpf_test signature_trie_test verify_overlaps_test
Change-Id: Ida78500c9ab4466de127b2c36501b3606d0f3fe5
2022-04-01 15:04:23 +01:00
Bob Badour
cf96d25b3d Fix breakage: bad path join using '/' literal am: 2a5c090c31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052015

Change-Id: I6ed0ca734baf7d5f05a15b618f57f2a6ec97c427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 08:54:20 +00:00
Bob Badour
2a5c090c31 Fix breakage: bad path join using '/' literal
Typo in filename s/b NOTICE.html.gz not NOTICES.html.gz

Bug: 227682036

Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97

Change-Id: I75cc28e3ef22d975ad46f4e167071f6d82ba253d
2022-03-31 23:40:28 -07:00
Bob Badour
6f7de5b1a9 Build notice files from license metadata. am: 43c2dcaef6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047886

Change-Id: Ifb7f10f9efc036f13a1c7f7ea4279ac53d0a4a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 22:43:10 +00:00
Sam Delmerico
489831660c convert java_import jars with arch variants
Bug: 220168131
Test: go test ./bp2build -run TestJavaImport
Test: b build '...'
Change-Id: Ib485e6905e7be9d199af5295b23131c226fd6e96
2022-03-31 21:00:24 +00:00
Bob Badour
43c2dcaef6 Build notice files from license metadata.
Switch from generate-notice-files.py and mergenotice.py to htmlnotice.

Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses
Change-Id: I6cac049d24f35ec358c6f341a04f4ba6161703bf
2022-03-31 17:29:01 +00:00