Commit Graph

66239 Commits

Author SHA1 Message Date
Jiakai Zhang
4abf2f4540 Merge changes from topic "boot-image-b280776428"
* changes:
  Dexpreopt ART jars and framework jars together.
  Unify installDirOnHost and installDirOnDevice.
  Remove the ability to install boot images by bootclasspath_fragments.
  Prepare tests for dexpreopt changes.
2023-05-12 10:48:44 +00:00
Rico Wind
b565f2f0df Ensure outputs correctly declared for proguard config in R8
Bug: 281081834
Test: manually inspect the file
Change-Id: Iaa8a99f1f1ae62b853e2a8dad613c2c6c886ff48
2023-05-12 12:30:07 +02:00
Justin Yun
8bd3afe68c VSDK: etc snapshot may have sub_dir for relative_install_path
prebuilt_etc may use sub_dir property to define a relative install
path. Use SubDir() to read either sub_dir or relative_install_path
property.

Bug: 282080219
Test: m vendor-image
Change-Id: I07a21c5aeb87b403854ed32976d26e70b046b8c1
2023-05-12 15:53:06 +09:00
Treehugger Robot
0247367032 Merge "Drop redundant libraries from baseline apexAvailable map" am: f8fbff1671
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2580794

Change-Id: I17364caed35b3a95a983dd0c22bcfcd8d92c04c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:45:05 +00:00
Treehugger Robot
f8fbff1671 Merge "Drop redundant libraries from baseline apexAvailable map" 2023-05-12 06:04:23 +00:00
Jingwen Chen
7481d8526b Merge "Revert "Make min_sdk overridable in override_apex"" am: 77e003c59a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2585632

Change-Id: Ib9b6d678ae01bf70d474957af38d0d64cce83edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:42:18 +00:00
Jingwen Chen
77e003c59a Merge "Revert "Make min_sdk overridable in override_apex"" 2023-05-12 04:57:27 +00:00
Joe Onorato
20724d34d8 Merge "TARGET_RELEASE is unavailable here, so don't print it." am: 8ef13dbb0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2584972

Change-Id: Ie444a7cc16b4915a48bcce664bf0a82c6acb30b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 02:30:44 +00:00
Joe Onorato
8ef13dbb0c Merge "TARGET_RELEASE is unavailable here, so don't print it." 2023-05-12 01:44:46 +00:00
Chris Wailes
6b82616c83 rustc-1.69.0 Build 10117114
Bug: https://issuetracker.google.com/issues/274972941
Test: m rust
Change-Id: If5570ba26080bdff38bdcbd65f6f1d7dc9f5bffc
2023-05-11 16:08:44 -07:00
Vinh Tran
ab8a268249 Merge "Implement bp2build converter for aidl_library" am: e8b63fddf9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2577313

Change-Id: I3007e88f782372bfa3baf34d8e3586f82f361fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:41:09 +00:00
Vinh Tran
e8b63fddf9 Merge "Implement bp2build converter for aidl_library" 2023-05-11 20:08:16 +00:00
Vinh Tran
ab506d297c Merge "Implement aidl_library module type" am: f409db7c0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2571770

Change-Id: Ibd0a5439105d38a6385a47499f9ff664a8d410cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:05:25 +00:00
Vinh Tran
f409db7c0c Merge "Implement aidl_library module type" 2023-05-11 18:53:21 +00:00
Mark Dacek
ed909d0c08 Merge "Rename soong_ui's upload-metrics-only mode." am: 3c18d4046b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2585665

Change-Id: Idca80365146f2779694f8f671e3cc872f0658cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 18:44:32 +00:00
Jiakai Zhang
c08c162b5a Dexpreopt ART jars and framework jars together.
Bug: 280776428
Test: atest art_standalone_dexpreopt_tests
Test: -
  1. m
  2. Check .invocation file (http://gpaste/6498044089466880)
  3. Check files in $ANDROID_PRODUCT_OUT/system/framework/x86_64
Test: -
  1. m dist
  2. Check files in out/dist/boot.zip
Test: -
  1. art/tools/buildbot-build.sh --host
  2. m test-art-host-gtest
  3. art/test/testrunner/testrunner.py --host
Test: m build-art-target-golem
Change-Id: I89490252e56a05edab03fdddc6539fa4d7f79756
2023-05-11 19:04:17 +01:00
Mark Dacek
3c18d4046b Merge "Rename soong_ui's upload-metrics-only mode." 2023-05-11 17:52:40 +00:00
Jingwen Chen
379221f086 Move disable downloads to bazelrc from mixed build
Keeps mixed builds and b consistent.

Bug: 275724420
Test: presubmits, especially bp2build-incremental
Change-Id: I89942111f259bf9a88c27e124adbdb73936c514c
2023-05-11 13:30:59 -04:00
Jiakai Zhang
09d88df040 Unify installDirOnHost and installDirOnDevice.
These two fields never do what they are described to do. This CL unifies
them to avoid the confusion.

Bug: 280440941
Test: m
Change-Id: I3652d73a50832a2e494d9f5cae750f5fc38293b4
2023-05-11 18:25:18 +01:00
Jiakai Zhang
b47caccbc0 Remove the ability to install boot images by bootclasspath_fragments.
We don't need this anymore because we are going to compile ART jars and
framework jars together.

Bug: 280776428
Test: m
Change-Id: I070157530449a1bb5779e25984c367df3dde7b36
2023-05-11 18:25:18 +01:00
Jiakai Zhang
b95998be73 Prepare tests for dexpreopt changes.
After this change, there is a clear separation between tests that are
related to dexpreopt and tests that are not. The former uses
PrepareForTestWithDexpreopt, while the latter uses
PrepareForTestWithJavaDefaultModules. The benefit is that the latter
will no longer affected by any dexpreopt changes.

Bug: 280776428
Test: m nothing
Change-Id: Ib957765b9287d51c082e0a33cee17a6bb56daeef
2023-05-11 18:24:44 +01:00
Cole Faust
c8a52d7009 Merge "Make mk2rbc output paths relative to android root" am: e89aff32ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2584918

Change-Id: Ie315cb950fbba259fcf141c0a12549aa67d11bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 17:14:36 +00:00
Lei Ju
32f3ea6760 Merge "Revert "rustc-1.69.0 Build 10095304"" am: c38f1d5145
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2585141

Change-Id: I405eb5c0ab99f9828e5dd3b63dd7aff29da9d7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 17:12:30 +00:00
Cole Faust
e89aff32ce Merge "Make mk2rbc output paths relative to android root" 2023-05-11 17:04:46 +00:00
Lei Ju
c38f1d5145 Merge "Revert "rustc-1.69.0 Build 10095304"" 2023-05-11 16:42:20 +00:00
Liz Kammer
bd58e74692 Revert "Make min_sdk overridable in override_apex"
This reverts commit 133c55b48a.

Reason for revert: change was untested and not working

Change-Id: I06d6e3c439ba541ae85dc148f91b184b9731b92d
2023-05-11 15:58:13 +00:00
Vinh Tran
3d16990b29 Implement bp2build converter for aidl_library
Test: go test
Bug: 278704136
Change-Id: Ia9c3772257af58e1de9041ba465130740b555fe4
2023-05-11 11:39:43 -04:00
Alix Espino
eac1c4ed31 Merge "Delete android/rules.bzl file" am: 98b86f76b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2584973

Change-Id: Iba1ac251d8f5a0b13ae65852d3442b10cd9ce7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:29:36 +00:00
Yi Kong
375a5cdf4d Merge "Update clang version to clang-r487747c" am: db381aa7d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2584591

Change-Id: I4ab64632154e36d69a5b504c6808299918de8cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:27:38 +00:00
Alix Espino
98b86f76b1 Merge "Delete android/rules.bzl file" 2023-05-11 15:19:35 +00:00
Yi Kong
db381aa7d9 Merge "Update clang version to clang-r487747c" 2023-05-11 14:50:01 +00:00
Alix Espino
bc6000d946 Merge "Delete kotlin/rules.bzl file" am: ea4b67d72c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582070

Change-Id: I7279728821e8669d804cba183572d5bf85d689e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:02:54 +00:00
Alix Espino
ea4b67d72c Merge "Delete kotlin/rules.bzl file" 2023-05-11 13:34:26 +00:00
Android Culprit Assistant
f36b2fae67 Revert "rustc-1.69.0 Build 10095304"
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/1fa75415-4722-46e3-b61b-7de26844a12d).

Change-Id: I7aabd3ff76c255ca13d594cc0f2f331ed8edc01b
2023-05-11 06:37:03 +00:00
Spandan Das
ebbea2a8c9 Allowlist aidl
Test: b build //system/tools/aidl

Change-Id: I3ddca72343822acf0a3d581061b32a37da6e1790
2023-05-11 01:12:03 +00:00
Spandan Das
df4c2134ea bp2build converter for cc libraries containing yacc
For cc_libraries containing .y/.yy srcs, we will generate an additional
cc_yacc_static_library target. This target will produce an .a file that
will be statically linked to the parent target.

Test: go test ./bp2build
Bug: 281546029
Change-Id: I094ba56f0a95869e5bc1e1d38b83c777192b7ddd
2023-05-11 01:11:56 +00:00
Spandan Das
6426f5d92e Merge changes from topic "stub-impl-per-api-domain" am: 494fca1328
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2577055

Change-Id: I0fed813c6fdb005902b7ec949e855e6bf8cd3090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 00:49:02 +00:00
Spandan Das
fae0900f2c Select stub/impl per apex variant am: 6d4d9da47f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2549671

Change-Id: I4d9218035425cde3503daecd706b622694e06e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 00:49:01 +00:00
Spandan Das
927bd9700b For test apexes, base_apex_name is the api domain am: a43ae1366e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582550

Change-Id: I5333bc77ba05e4173508dd947810ec2c91cea0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 00:48:59 +00:00
Spandan Das
8adfbc21e3 Broaden the granularity of config_setting from apex_name to api_domain am: 9cad90f966
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2577054

Change-Id: I47194c91febd64c91350ac203cc942a1ebed68b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 00:48:57 +00:00
Spandan Das
ac71470224 Print default val if all vals in axis match default val am: 921af32310
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2564550

Change-Id: I5f0130bec945fdd54187d403c3c8da9e13c88899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 00:48:54 +00:00
Spandan Das
494fca1328 Merge changes from topic "stub-impl-per-api-domain"
* changes:
  Special case platform variant of bootstrap libs
  Select stub/impl per apex variant
  For test apexes, base_apex_name is the api domain
  Broaden the granularity of config_setting from apex_name to api_domain
  Print default val if all vals in axis match default val
2023-05-11 00:13:44 +00:00
Pirama Arumuga Nainar
4026558dc7 [cc] Remove deprecated clang flag for auto-var-init
Bug: http://b/259559364
Bug: http://b/267819531

The extra flag is no longer needed by the scan-deps used by RBE.

Test: `USE_RBE m`
Change-Id: Ia35b78f7b28f9008479256d9fead253910627254
2023-05-11 00:01:25 +00:00
Chris Wailes
1ab853fa4b Merge "rustc-1.69.0 Build 10095304" am: a1909da281
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2583157

Change-Id: Icc5898b92b046c7b98c71a8d09d4a33409ccd7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:42:35 +00:00
Chris Wailes
a1909da281 Merge "rustc-1.69.0 Build 10095304" 2023-05-10 22:53:50 +00:00
Cole Faust
60fff115b1 Merge "Bp2build support for soong config variables + os" am: 069812158f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2576792

Change-Id: I233fbaf7f039319c8720048eaed7bce2dafee404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:09:41 +00:00
Cole Faust
069812158f Merge "Bp2build support for soong config variables + os" 2023-05-10 21:28:02 +00:00
Treehugger Robot
38811402f3 Merge changes from topic "remove_suffixes" am: a321926546
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2582911

Change-Id: I8af82c257072ac91aaa578ae18ea282ad7471f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:03:46 +00:00
Vinh Tran
0e7fd8a14b Implement aidl_library module type
We currently specifies aidl files directly to the srcs prop on a filegroup or other module types such as cc_library or java_library. We use aidl.include_dirs prop to specify paths to aidl headers. This include_dirs pattern isn't migratable to Bazel because Bazel requires explicit dependencies.

This CL introduces aidl_library to better map with Bazel's aidl_library rule and to enable aidl headers to be specified in a separate aidl_library or the hdrs prop. A follow-up CL will turn on inputs sandbox to enforce all aidl headers be explicitly specified in Android.bp

Test: go test
Bug: 278704136
Change-Id: I2c99af080525bf8a6c5724ed5ee2001842969098
2023-05-10 16:46:20 -04:00
Treehugger Robot
a321926546 Merge changes from topic "remove_suffixes"
* changes:
  Propagate shared library destination path through FilesToZip
  Add -e argument to soong_zip to allow setting an explicit filename
  Support removing suffix for device specific prebuilt during build
2023-05-10 20:30:11 +00:00