Commit Graph

73381 Commits

Author SHA1 Message Date
Treehugger Robot
1c9977aece Merge "Change OnlyPreoptBootImageAndSystemServer to OnlyPreoptArtBootImage." into main am: 34778a9301
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2822402

Change-Id: Ib046322e1c6c6416b9e156630db46f7f8fe5c59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:20:07 +00:00
Treehugger Robot
34778a9301 Merge "Change OnlyPreoptBootImageAndSystemServer to OnlyPreoptArtBootImage." into main 2023-11-10 18:47:19 +00:00
Jihoon Kang
f8b33b5629 Merge "Revert^2 "Default from-text stub generation in build"" into main am: 8c4387e478
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2807659

Change-Id: I6dfd49afbee9b45d66ffee080ca4e1bd2e4332f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 04:26:25 +00:00
Jooyung Han
82df86a30b Merge "Deprecate 'contributions' field from linkerconfig" into main am: 5d9fb52087
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2821310

Change-Id: Id19748abedb11b0487d65de6c163c86821d6a1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 04:26:10 +00:00
Jihoon Kang
8c4387e478 Merge "Revert^2 "Default from-text stub generation in build"" into main 2023-11-10 04:10:24 +00:00
Jooyung Han
5d9fb52087 Merge "Deprecate 'contributions' field from linkerconfig" into main 2023-11-10 03:55:49 +00:00
Seungjae Yoo
1d734e730b Merge "Add security_patch avb property for android_filesystem" into main am: 54c63ac015
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2822052

Change-Id: Ief346ddc9b4bf0e60d49109b450a633b09326728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 01:29:10 +00:00
Seungjae Yoo
54c63ac015 Merge "Add security_patch avb property for android_filesystem" into main 2023-11-10 01:03:55 +00:00
Cole Faust
ca863f1896 Merge "Sandbox hidl genrules" into main am: ec8f0ca86c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2823075

Change-Id: Ifab77ecd5e04747aaab387a736fe07b28563bd3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 22:49:51 +00:00
Cole Faust
ec8f0ca86c Merge "Sandbox hidl genrules" into main 2023-11-09 22:05:49 +00:00
Treehugger Robot
912ab664a4 Merge "Sandbox CompilationTestCases_package-dex-usage" into main am: 05dafa1772
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2822952

Change-Id: I46c417e4c160f8fe9124fbb753b231e26adb0b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 20:50:24 +00:00
Dennis Shen
d4f7952d34 Merge "Add dependency of liblazy_static" into main am: 10b38c4957
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2823411

Change-Id: Ic4db998a7289be67289460a37b8253e5248013d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 20:49:40 +00:00
Treehugger Robot
05dafa1772 Merge "Sandbox CompilationTestCases_package-dex-usage" into main 2023-11-09 20:41:30 +00:00
Dennis Shen
10b38c4957 Merge "Add dependency of liblazy_static" into main 2023-11-09 20:03:41 +00:00
Colin Cross
a2dc5fcf20 Merge changes I4d0b27ba,Ic48e9cf2 into main am: 4ade19fe94
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2823833

Change-Id: Ie02765345bdb7d42587b83b080639fc295619fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 19:38:52 +00:00
Colin Cross
4ade19fe94 Merge changes I4d0b27ba,Ic48e9cf2 into main
* changes:
  Fix soong_ui file rlimits for go 1.21
  Fix TestReverseSlice for go 1.21
2023-11-09 18:47:40 +00:00
Jiakai Zhang
2398442ec0 Change OnlyPreoptBootImageAndSystemServer to OnlyPreoptArtBootImage.
OnlyPreoptBootImageAndSystemServer was for making the eng build faster.
This change makes it even faster.

Bug: 309011617
Test: Presubmit
Change-Id: If9001e99593b57deafa7b56f0ca6b3d4d80f56d3
2023-11-09 16:50:58 +00:00
Dennis Shen
ba6ed2d62a Add dependency of liblazy_static
Bug: b/307336730
Change-Id: I2c89b0f73787649408e2a23f3f308b3e0eb0c9ea
2023-11-09 15:07:04 +00:00
Anas Sulaiman
d93ea44069 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824 am: 169eb99d24 am: ea7d5dcb43 am: ad419834ad am: c1f26e6138 am: c41de47a9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I3f09e8e6c6fd862e7810060ab5353e6dd4f2122b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 06:26:17 +00:00
Anas Sulaiman
03cbb75358 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824 am: 169eb99d24 am: ea7d5dcb43 am: abbefed224 am: 6c40990cd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I4470baf03a4c5165ad43eb6c922f604be8d30044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 06:25:55 +00:00
Anas Sulaiman
c41de47a9c fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824 am: 169eb99d24 am: ea7d5dcb43 am: ad419834ad am: c1f26e6138
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I15f4ca3f220ec84510059984c61a58570d6a88ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 06:23:45 +00:00
Colin Cross
611a2fbdd7 Fix soong_ui file rlimits for go 1.21
Go 1.21 modifies the file limit but restores the original when
execing subprocesses if it hasn't be overridden.  Call Setrlimit
even if it doesn't appear to be necessary so that the syscall package
considers it set.

Bug: 309895579
Test: m nothing
Change-Id: I4d0b27bac90a2a88bfc68a8491d54dc106e1ec13
2023-11-08 22:11:28 -08:00
Colin Cross
f2fab8347d Fix TestReverseSlice for go 1.21
Go 1.21 does a better job using the same empty allocation for empty
slices, check for cap > 0 before requiring slices to have different
backing arrays.

Bug: 309895579
Test: TestReverseSlice
Change-Id: Ic48e9cf2c95ea0b810a11cdc4a794a70c02a0a61
2023-11-08 22:11:24 -08:00
Seungjae Yoo
a30e450ba0 Add security_patch avb property for android_filesystem
If android_filesystem module is used with use_avb, defined
security_patch for the rollback protection.

Bug: 285855436
Test: m
Test: avbtool info_image --image <IMAGE>
Change-Id: I32c6108bb1aca398ced5e46b615d937685e261a7
2023-11-09 14:55:44 +09:00
Anas Sulaiman
6c40990cd0 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824 am: 169eb99d24 am: ea7d5dcb43 am: abbefed224
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: Ie5ab6037934a78ee7aa37710668294dfb6ecd069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 05:16:06 +00:00
Anas Sulaiman
c1f26e6138 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824 am: 169eb99d24 am: ea7d5dcb43 am: ad419834ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I6d656b2b4e52165ac7c277c926fa47c8fb5d7024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 05:11:25 +00:00
Cole Faust
98f2f2c771 Sandbox hidl genrules
go/roboleaf-busy-beavers-sandboxing

Most of these genrules work out of the box with sandboxing, I'm not sure why they were added.
However hidl_hash_test_gen needs a fix, and hidl2aidl_translate_cpp_test_gen_src produces
nondeterministic results even without sandboxing.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py hidl2aidl_test_gen_aidl hidl2aidl_translate_cpp_test_gen_headers hidl2aidl_translate_cpp_test_gen_src hidl2aidl_translate_java_test_gen_src hidl2aidl_translate_ndk_test_gen_headers hidl2aidl_translate_ndk_test_gen_src hidl_cpp_impl_test_gen-headers hidl_cpp_impl_test_gen-sources hidl_error_test_gen hidl_export_test_gen-headers hidl_format_test_diff hidl_hash_test_gen hidl_hash_version_gen hidl_java_impl_test_gen
Change-Id: Ia865ba3ed9b1ede21b440c3b640fcdb5d7661c9d
2023-11-09 04:44:33 +00:00
Anas Sulaiman
ad419834ad fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824 am: 169eb99d24 am: ea7d5dcb43
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: If1899452cadc897821b03779991c4a214c6913f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:47:37 +00:00
Anas Sulaiman
abbefed224 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824 am: 169eb99d24 am: ea7d5dcb43
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: Ie8100f0e7354d2578b6953a071317d0a136e57d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 03:47:22 +00:00
Anas Sulaiman
ea7d5dcb43 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824 am: 169eb99d24
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I0039e3e4ed092f7dbc56e6e791fbfb276aa0b63f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 02:38:31 +00:00
Spandan Das
26da80db09 Merge changes from topic "apex_contributions_build_flags" into main am: c31b24977e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808754

Change-Id: I5b8b12c7e74c6342807667587d0941a0c366f222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 02:03:15 +00:00
Spandan Das
c31b24977e Merge changes from topic "apex_contributions_build_flags" into main
* changes:
  Special-case java_sdk_library in source vs prebuilt selection
  Use `all_apex_contributions` for source/prebuilts selection
  Create a singleton all_apex_contributions module type
2023-11-09 01:31:57 +00:00
Anas Sulaiman
169eb99d24 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d am: 14f5cdd824
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: Iac6e55aaf93b1e586743f5cda1f342f6b35375d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 01:20:53 +00:00
Anas Sulaiman
14f5cdd824 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496 am: 8943d6411d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I72c2062427b7176ec85104347ab2a9cb707fb700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 00:02:54 +00:00
Anas Sulaiman
8943d6411d fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d am: 534606b496
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I82e28620bd8d592c12210a3e862bc260bb54d21f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:41:27 +00:00
Anas Sulaiman
534606b496 fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105 am: 22afad5c2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I49a81fe9ff72dded4c28a2f5e1c3926cd67d78b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:31:14 +00:00
Anas Sulaiman
22afad5c2d fix potential encoding issues in remote actions am: db56d5a229 am: 2a1fd78105
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I410e9384f804e37b1fd1162ed5ae815649f96c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 20:19:42 +00:00
Treehugger Robot
e87abab404 Merge "Assign default bug component to targets in this directory." into main am: 38ec22a816
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817577

Change-Id: I4d9ef63ddd254a560589e1537c4e7272e291d3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 19:33:31 +00:00
Dan Willemsen
e97d96782b Merge "Update the minimum macos deployment version to 10.14" into main am: f051ec6de2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2821057

Change-Id: Ia9dd5c2e109135bc20f24e8af1af7f90d37d6481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 19:32:58 +00:00
Anas Sulaiman
2a1fd78105 fix potential encoding issues in remote actions am: db56d5a229
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25262953

Change-Id: I10cac36a94f9a30266d7d076f668bc8fe2f351bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 19:24:49 +00:00
Treehugger Robot
38ec22a816 Merge "Assign default bug component to targets in this directory." into main 2023-11-08 18:52:32 +00:00
Dan Willemsen
f051ec6de2 Merge "Update the minimum macos deployment version to 10.14" into main 2023-11-08 18:46:51 +00:00
Cole Faust
4c5b4cd2e8 Sandbox CompilationTestCases_package-dex-usage
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py CompilationTestCases_package-dex-usage
Change-Id: I8cfc445bb10dfe8344e8dd4e7085f474004314af
2023-11-08 10:38:15 -08:00
Spandan Das
fc12d2f494 Special-case java_sdk_library in source vs prebuilt selection
If a java_sdk_library is listed in `contents`, then restrict the source
vs prebuilt selection superseding to only the internal stub libraries.

Defer the source vs prebuilt selection mechanism of the top-level
library to the existing mechanisms for now. This is necessary because
this top-level library acts as a hook for
- hiddenapi: boot jars are deapxed from the prebuilt apex
- dexpreopt: system server jars are deapexed from the prebuilt apex and
  installed via required

If `next` uses `framework-foo` and `service-foo` as the top-level
library instead of the prebuilt equivalents, then the bootjars installed
in out/soong/dexpreopt_x86_64/apex_bootjars will come from source. And
the *.odex files of the system server jars will come from source.

Bug: 308174768
Test: Added a java_sdk_library unit test to assert that the new
mechanism supersedes the `prefer` flag

Change-Id: Ib43198a3b547c58b54f1f0966e95584215096d32
2023-11-08 18:37:24 +00:00
Spandan Das
1c4d94dccf Use all_apex_contributions for source/prebuilts selection
This flattened singleton module explicitly lists by module name whether source or
prebuilt version of a module should be used. If a module appears in this
metadata module, it supersedes all other source vs prebuilts selection
mechanism

Implementation details
- Update the module dep chain from <source> --> <prebuilt> to <source>
  --> <prebuilt> --> all_apex_contributions
- all_apex_contributions sets a provider which is bubbled up
  to the source module. This requires changing `prebuilt_select` to a
  bottom up mutator
- Update `usePrebuilt` to consult the new provider before falling back
  to existing source vs selection mechanisms. If (foo|prebuilt_foo) is
  listed in the selected `apex_contributions` modules, it
  will be used superseding any other selection mechanisms.
- Update this depTag to IsMetaDepTag so that bootclasspath_fragment's
  validation ignores this new dependency.

Test: Added unit tests to assert that this new mechanism supersedes
`use_source_config_var`

Bug: 308174768
Change-Id: I39a85639642711f3c96b6f18b94d626b55e80c66
2023-11-08 18:37:24 +00:00
Spandan Das
e3fcb41ff7 Create a singleton all_apex_contributions module type
This will be a container for the the apex_contributions
selected using build flags. This module will be used to query the state of
selected apex contributions instead of a global that can be mutated by
anyone.

It will set a provider containing metadata for source vs prebuilts
selection. To reduce the overhead of a new mutator, this will be done in
the existing `prebuilt_select` mutator.

It will validate that there are no dups (`foo` and `prebuilt_foo` cannot
be both selected)

Bug: 308174923

Test: go test ./android

Change-Id: Ie42999a71f35d70e0e977f5ab07ce451608d9f35
2023-11-08 18:37:18 +00:00
Ronish Kalia
7e30bf00e2 Assign default bug component to targets in this directory.
This CL is being created to improve the test attribution in android. It has
been found that the tests owned by this OWNERS are not not being attributed
to a buganiser component.
This is part of a bigger effort to attribute all of the aosp code. 

If you think that the buganiser component is not correct please update
this CL with correct component and drop a +2. We will use the updated component and merge the CL

Bug: 309090038
Change-Id: Ia9dbd8ada1fc9c3ab358c8992d804925f6719f3c
Test: N/A
2023-11-08 16:19:51 +00:00
Jiakai Zhang
b39cf8346f Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I2c25896a1495fb64709dc51f4bd253ed7fc59e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 11:28:53 +00:00
Jiakai Zhang
04445d5443 Merge "Use the correct mainline BCP jars for app dexpreopt." into main 2023-11-08 10:56:58 +00:00
Anton Hansson
45114303f5 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: I4d668824a55df53562943c2066274cdda7c5cbaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:52:19 +00:00