Commit Graph

56070 Commits

Author SHA1 Message Date
Ember Rose
09ba2cc0ab Merge "Rename InvalidNullabilityOverride suppression" am: 1d3b79f78f am: f4d7122237 am: 3739605cea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051891

Change-Id: Ie892f9594afc504be62a7a1c19bfda3541f99f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:55:06 +00:00
Ember Rose
3739605cea Merge "Rename InvalidNullabilityOverride suppression" am: 1d3b79f78f am: f4d7122237
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2051891

Change-Id: I1f8600b979b50cda7e6b308744ef7de852ed8df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 18:27:34 +00: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
Ember Rose
1d3b79f78f Merge "Rename InvalidNullabilityOverride suppression" 2022-04-01 17:53:00 +00:00
Wei Sheng Shih
67c0b63929 Revert "Build notice files from license metadata." am: 77807b3c27 am: 72f9cdb599 am: 6c698e406d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052565

Change-Id: I7e4f410833a4b8349e476d6fca4b2161c8f254f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 17:26:29 +00:00
Wei Sheng Shih
6c698e406d Revert "Build notice files from license metadata." am: 77807b3c27 am: 72f9cdb599
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052565

Change-Id: I84665416e2346e11046892f6ccbbcd7cf0468e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 17:06:12 +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
Bob Badour
c64d309ce2 Fix breakage: bad path join using '/' literal am: 2a5c090c31 am: cf96d25b3d am: ec84245e25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052015

Change-Id: I5e8ea66626e0cde29a7c24f370b85548ae6b5d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:27:15 +00:00
Bob Badour
ec84245e25 Fix breakage: bad path join using '/' literal am: 2a5c090c31 am: cf96d25b3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2052015

Change-Id: Ied9a569c0941fe2525cbfb448137a6c92940ddf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:07:56 +00: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
8d17118d5a Build notice files from license metadata. am: 43c2dcaef6 am: 6f7de5b1a9 am: cbcf8d9b05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047886

Change-Id: I6a76eee6321538b70c331a2e2a9cb1e5b644ac04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 23:13:51 +00:00
Bob Badour
cbcf8d9b05 Build notice files from license metadata. am: 43c2dcaef6 am: 6f7de5b1a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047886

Change-Id: I09993978f902d3e4b569cd676de0a56d5638ff2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 22:59:24 +00: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
TreeHugger Robot
86aa11c043 Merge "Clear apex.go entries for bluetooth libs" into tm-dev 2022-03-31 21:37:02 +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
Treehugger Robot
9d404443c6 Merge "Allow Rust for tombstoned client." am: 76ff96f885 am: 2774891cd6 am: 7662640b42
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042045

Change-Id: I4ac7e638a1763d4fabba8a7bd6e44ec516c371f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 14:06:22 +00:00
Treehugger Robot
7662640b42 Merge "Allow Rust for tombstoned client." am: 76ff96f885 am: 2774891cd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042045

Change-Id: Ida22f0ccbfc886f741a4c3308027922c47ae0529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 13:47:44 +00:00
Treehugger Robot
2774891cd6 Merge "Allow Rust for tombstoned client." am: 76ff96f885
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2042045

Change-Id: Ic925bdde55c4b49e5055117786add77f198258a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 13:24:34 +00:00
Treehugger Robot
76ff96f885 Merge "Allow Rust for tombstoned client." 2022-03-31 13:01:10 +00:00
Sam Delmerico
dc459dc9c1 Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3 am: a2db166241 am: fd13aac77a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: I320fc8b4385337497d684399e6f6b0c54084f8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 22:07:11 +00:00
Treehugger Robot
5d123b15d9 Merge changes from topic "no-srcs-no-deps" am: d93afba1e6 am: d218781011 am: beb28cd9ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: I8c8c7b973ffc6a6dfd91c35dc96e73c42bf30577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 22:07:01 +00:00
Sam Delmerico
fd13aac77a Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3 am: a2db166241
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: Ibe7c1a290934a9992009946d51dc0b6cc31df235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:45:45 +00:00
Treehugger Robot
beb28cd9ad Merge changes from topic "no-srcs-no-deps" am: d93afba1e6 am: d218781011
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: I61f076d3e872e90b9375cd6fee2639863dd016cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:45:36 +00:00
Sam Delmerico
a2db166241 Merge changes I8e4c3f37,I89a32bde am: 3c25ab1ac3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032106

Change-Id: Ic058bec1f52af235e047c1d96aaf8624f1e6e454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:29:23 +00:00
Treehugger Robot
d218781011 Merge changes from topic "no-srcs-no-deps" am: d93afba1e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1995730

Change-Id: Ibde8e40e3b7f704aee45c32b0c922c3178cbadf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 21:28:59 +00:00
Sam Delmerico
3c25ab1ac3 Merge changes I8e4c3f37,I89a32bde
* changes:
  add plugins to javaLibraryAttributes
  convert java_import_host with bp2build; enable jetifier
2022-03-30 21:08:12 +00:00
Treehugger Robot
d93afba1e6 Merge changes from topic "no-srcs-no-deps"
* changes:
  enable conversion of all java_import modules
  emulate java_library static_deps with Bazel exports
2022-03-30 21:06:46 +00:00
Treehugger Robot
dfab76d1ac Merge "analyze_bcpf: Compute hidden_api package properties" am: 91dac89447 am: c17a61f6f6 am: ee99468ff2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034243

Change-Id: Ib1608a94d4a185e2b86c157f27970c74c0a2a0a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:44:33 +00:00
Cole Faust
95d500cd04 Merge "Always build mk2rbc/rbcrun" am: 71350eaff2 am: 460e1a5a6b am: b6d282af41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044703

Change-Id: Ie4d1689c77e60955468203aeef5ff1e487eb9713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:44:03 +00:00
Treehugger Robot
ee99468ff2 Merge "analyze_bcpf: Compute hidden_api package properties" am: 91dac89447 am: c17a61f6f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034243

Change-Id: I8378c6c42501ef831c95f1c58cae9833db7090b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:21:06 +00:00
Cole Faust
b6d282af41 Merge "Always build mk2rbc/rbcrun" am: 71350eaff2 am: 460e1a5a6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044703

Change-Id: Iedfdfc0af749dadab1904b7371483bf566af7b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:20:43 +00:00
Treehugger Robot
c17a61f6f6 Merge "analyze_bcpf: Compute hidden_api package properties" am: 91dac89447
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034243

Change-Id: I3bd821f1daa1b78b428bf4a9f455beb1f46008fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 20:19:02 +00:00
Treehugger Robot
91dac89447 Merge "analyze_bcpf: Compute hidden_api package properties" 2022-03-30 20:00:43 +00:00
Cole Faust
460e1a5a6b Merge "Always build mk2rbc/rbcrun" am: 71350eaff2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2044703

Change-Id: If4e0039a97c0927fc75e9598af8de2d774883354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 19:56:04 +00:00
Cole Faust
71350eaff2 Merge "Always build mk2rbc/rbcrun" 2022-03-30 19:43:06 +00:00
Sam Delmerico
77267c7d9c add plugins to javaLibraryAttributes
Test: go test ./bp2build
Change-Id: I8e4c3f373c62c60ea5013cd8c585915a366c1f81
2022-03-30 19:19:13 +00:00
Sam Delmerico
5f83b491b4 convert java_import_host with bp2build; enable jetifier
Also, add java_imports that were blocked by jetifier binary.
b/221082840 was blocking the build of jetifier which these java_imports
depended on. That bug is now resolved, so we can unblock these targets.

Bug: 220168131
Test: b build //packages/apps/Car/libs/car-ui-lib/car-ui-androidx/...
Test: build/bazel/ci/bp2build.sh
Change-Id: I89a32bde30c133a44aeb7826afa11d4140433f5d
2022-03-30 19:19:13 +00:00
Sam Delmerico
a9b047a9da enable conversion of all java_import modules
Bug: 220168131
Test: b build '...'
Change-Id: Ib1eaf47b81ac19cb6e930e5f9f3fc2aebe02b0c1
2022-03-30 19:19:09 +00:00
Sam Delmerico
c016143602 emulate java_library static_deps with Bazel exports
In Soong, java_library can specify static_deps which are dependencies
that get aggregated into the final jar (akin to static linking). This is
useful because it allows dependencies higher up in the chain to compile
against the APIs exported by transitive dependencies. Bazel does not
support this functionality directly, but it can be emulated via the
exports attribute which makes any targets listed in the attribute public
to targets further up the chain.

Bug: 217236083
Bug: 219908977
Test: b build //external/error_prone:error_prone_core
Test: b build //external/bouncycastle:bouncycastle-host
Test: b build --platforms=//build/bazel/platforms:linux_x86
  //prebuilts/sdk/tools/jetifier/jetifier-standalone:jetifier
Change-Id: I2867e3f816de720a6f4bd9ff7a847d1b0c2da2d6
2022-03-30 18:58:38 +00:00
Paul Duffin
a3722954ea analyze_bcpf: Add --fix option am: 26f19919ea am: 37a95341d9 am: 953b1dfc41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047416

Change-Id: I722447c1e2d806b55bf98abcfbfa9feec05a09e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:29:30 +00:00
Paul Duffin
953b1dfc41 analyze_bcpf: Add --fix option am: 26f19919ea am: 37a95341d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047416

Change-Id: I23ae9e0208e5297f8b9297039e79499b4796c31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 18:05:32 +00:00
Paul Duffin
37a95341d9 analyze_bcpf: Add --fix option am: 26f19919ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2047416

Change-Id: I74d07bf3a24e0d8c02262efcc44b9c1e2fc9772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 17:45:44 +00:00
Paul Duffin
ff489b61c5 Add analyze_bcpf.py script to help manage bootclasspath_fragments am: 4dcf65951b am: a87d148823 am: 04c32d2b98
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020741

Change-Id: I0a46883c16ebaf59fcf30437c592bf1ca9823102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 16:07:05 +00:00
Paul Duffin
04c32d2b98 Add analyze_bcpf.py script to help manage bootclasspath_fragments am: 4dcf65951b am: a87d148823
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020741

Change-Id: Ifdbd09d2ccae7cc0beb57b12e037a7edc409da34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:43:48 +00:00
Paul Duffin
a87d148823 Add analyze_bcpf.py script to help manage bootclasspath_fragments am: 4dcf65951b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2020741

Change-Id: I92c0a9d5b9d63abf04af465840ff6f0d13ef03e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:20:18 +00:00
Paul Duffin
dd97fd2520 analyze_bcpf: Compute hidden_api package properties
Analyzes the signatures of the class members contained within the
bootclasspath_fragment to construct the split_packages,
single_packages and package_prefixes hidden_api properties that are
necessary to remove the internal implementation details from the
hidden API flags.

Bug: 202154151
Test: m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment
      m analyze_bcpf && analyze_bcpf --bcpf art-bootclasspath-fragment --fix
      m analyze_bcpf && analyze_bcpf --bcpf com.android.mediaprovider-bootclasspath-fragment --fix
      atest --host analyze_bcpf_test
Change-Id: I4a8e5a8bfee2a44775e714b9226cd4a7382e0123
2022-03-30 16:00:08 +01:00
Paul Duffin
26f19919ea analyze_bcpf: Add --fix option
Add a --fix option that will cause the script to automatically fix the
issues that it finds. It uses the bpmodify tool to add values to the
bootclasspath_fragment's hidden_api properties.

This adds analyze_bcpf to bp2buildModuleDoNotConvertList as
analyze_bcpf depends on bpmodify which is a blueprint_go_binary which
is not yet supported by bazel.

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: I5ee52419b4829474f6dbeb47f86ab2aeb22b1382
2022-03-30 16:00:08 +01:00