Commit Graph

76092 Commits

Author SHA1 Message Date
Inseob Kim
99913d4e59 Merge "Add support for auto-generated characteristics RRO" into main am: b5d713f2cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817177

Change-Id: Ie4a539f9001bdbd2fc91fedbfc9869a1c35b15d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 05:43:44 +00:00
Inseob Kim
b5d713f2cb Merge "Add support for auto-generated characteristics RRO" into main 2023-11-17 05:02:28 +00:00
Inseob Kim
34dc4cd738 Add support for auto-generated characteristics RRO
Setting Generate_product_characteristics_rro will automatically generate
an RRO package which contains resources with
'product="{PRODUCT_CHARACTERISTICS}"'. The RRO package will be installed
to /product partition. The app will be compiled with '--product
default', making the app identical to all targets.

Motivation for this change is to minimize divergence of system.img.

Bug: 294799593
Test: boot and idmap2 dump
Change-Id: I1371f7410a1ecf337e1f73214b024af39aa6d57a
2023-11-17 11:15:32 +09:00
Jihoon Kang
a7fa500d0b Merge "Revert "Modify conditionals for BuildFromTextStub()"" into main am: 88d5104ca1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2835871

Change-Id: Ib79289639a9a2cc1af22b1410a53d5647322a815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 01:20:06 +00:00
Jihoon Kang
88d5104ca1 Merge "Revert "Modify conditionals for BuildFromTextStub()"" into main 2023-11-17 01:04:34 +00:00
Treehugger Robot
404fd1cce8 Merge "Modify conditionals for BuildFromTextStub()" into main am: 72a8cee8fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2832580

Change-Id: I19219038d92e1aa018c7c4ed9a8583b714c55b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 01:04:08 +00:00
Jihoon Kang
77f6ca4919 Revert "Modify conditionals for BuildFromTextStub()"
Revert submission 2832580-sdk-from-source-stub

Reason for revert: Breaking sdk builds
Reverted changes: /q/submissionid:2832580-sdk-from-source-stub

Change-Id: I447e0832950a1aa91df0aed348bdec01528d568d
2023-11-17 00:58:40 +00:00
Treehugger Robot
72a8cee8fe Merge "Modify conditionals for BuildFromTextStub()" into main 2023-11-17 00:29:05 +00:00
Jihoon Kang
33e39ae583 Modify conditionals for BuildFromTextStub()
This change modifies config.BuildFromTextStub() to return false when
deviceConfig.BuildFromSourceStub() is set to true.

Test: m nothing
Bug: 311203379
Change-Id: I3b56881fbe2565da20e23470398bf6550c618fb0
2023-11-16 23:02:47 +00:00
Cole Faust
877a79fe28 Merge "Improve genrule sandboxing script" into main am: c3b56b8403
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2831929

Change-Id: I6757ccaae30ae5ff93b491a2d06cdc4eca8ebbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 20:28:02 +00:00
Cole Faust
c3b56b8403 Merge "Improve genrule sandboxing script" into main 2023-11-16 19:55:29 +00:00
Anas Sulaiman
1f05a92ee7 Merge "fix RE for metalava actions" into main am: a290364c57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2833371

Change-Id: I09b7e737f5d8c3433867aae40891782a1c2cb16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 19:03:37 +00:00
Treehugger Robot
3e062a051a Merge "Sandbox netsim genrules" into main am: bc1d0d8ce8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2833510

Change-Id: Ie51f8df2caa48eaa35984eba04c44773806c017c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 18:59:44 +00:00
Anas Sulaiman
a290364c57 Merge "fix RE for metalava actions" into main 2023-11-16 18:42:30 +00:00
Treehugger Robot
bc1d0d8ce8 Merge "Sandbox netsim genrules" into main 2023-11-16 18:06:09 +00:00
Treehugger Robot
25606eb72a Merge "Add installable to prebuilt_kernel_modules" into main am: 6df9a41155
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818557

Change-Id: I7857633608a295e430f5be7d5070b05488e11413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 13:47:33 +00:00
Treehugger Robot
6df9a41155 Merge "Add installable to prebuilt_kernel_modules" into main 2023-11-16 13:07:29 +00:00
Treehugger Robot
5c8f4f446d Merge "Add contribute_to_android_api property in java_sdk_library" into main am: 7fcb470251
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2832851

Change-Id: I9be66305f8b2da9ea8026bf197f578961e088ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 22:45:50 +00:00
Aditya Kumar
adcbe0e59d Merge "Provide an environment variable to disable mlgo" into main am: a70ebccccf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2830410

Change-Id: I10bef3395ee40c70623e4da8ec28fe5ee9b6db6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 22:45:40 +00:00
Colin Cross
516edfa5dd Merge "Split *ModuleContext out of module.go" into main am: 8d25afd575
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2832037

Change-Id: I262a6521751f50bfe28f90eacd587711c10e4c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 22:44:48 +00:00
Treehugger Robot
7fcb470251 Merge "Add contribute_to_android_api property in java_sdk_library" into main 2023-11-15 22:25:22 +00:00
Aditya Kumar
a70ebccccf Merge "Provide an environment variable to disable mlgo" into main 2023-11-15 22:13:18 +00:00
Colin Cross
8d25afd575 Merge "Split *ModuleContext out of module.go" into main 2023-11-15 22:05:43 +00:00
Zi Wang
2734f5ed17 Merge "Remove "Test" prop from xx_aconfig_library build rules" into main am: 55d884421b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828732

Change-Id: Iba093158fd38adbf5e9ae3858d3cb5d9fa3acab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 21:21:01 +00:00
Colin Cross
d50b463e66 Merge "Stop collecting path entry for module_bp_java_deps.json from each module type" into main am: d7812415c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2831928

Change-Id: I13c077e58d39a86ce14d3b89551b369d6a9cc5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 21:19:28 +00:00
Zi Wang
55d884421b Merge "Remove "Test" prop from xx_aconfig_library build rules" into main 2023-11-15 21:03:46 +00:00
Colin Cross
d7812415c3 Merge "Stop collecting path entry for module_bp_java_deps.json from each module type" into main 2023-11-15 21:01:38 +00:00
Treehugger Robot
81bf6dba96 Merge "Sandbox ControlEnvProxyServerProto" into main am: 9cb8fcbe06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2831927

Change-Id: I6b45344218632b21c95858dff45223c2c497ff5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 20:49:24 +00:00
Cole Faust
3ea3ee5a68 Sandbox opengl genrules am: 9844817148
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2831926

Change-Id: Ic10733726ea4866c4a796c1871738b1db7f57e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 20:49:01 +00:00
Treehugger Robot
9cb8fcbe06 Merge "Sandbox ControlEnvProxyServerProto" into main 2023-11-15 20:44:43 +00:00
Jihoon Kang
80456fdec4 Add contribute_to_android_api property in java_sdk_library
The default-false bool property `contribute_to_android_api` will be used to signify whether the java_sdk_library module contributes to an api
surface (i.e. listed in frameworks-base-api.bootclasspath or not).
If the property is set to true, the module's stub jar can be
generated from .txt files.

Currently, the property is a no-op. The property will be utilized in the
child changes.

Test: m nothing
Bug: 276958307
Change-Id: I617802ec352c7055579ce92ea3de43f10cac1da4
2023-11-15 20:40:37 +00:00
Anas Sulaiman
3f465a4685 fix RE for metalava actions
Some of those actions use unzip which is not available in the source
tree and needs to be installed in the container.

Bug: b/309783005
Test: Ran an android build and verified there are no local fallbacks from metalava actions.
Change-Id: I36fcfe00f99d98721b1877aa99a08a536b3dd0c6
2023-11-15 20:39:53 +00:00
Cole Faust
a4bb034fee Sandbox netsim genrules
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py FrontendStub_cc FrontendStub_h PacketStreamerStub_cc PacketStreamerStub_h
Change-Id: Icfb4830a6deb7fe403407d99a39d4bac99ee290d
2023-11-15 12:03:02 -08:00
Cole Faust
a57c8c29bb Improve genrule sandboxing script
Do the sandboxed and non-sandboxed builds in two separate directories.
This allows us to keep the directories around so you can compare diffs
afterwards, and allows us to run the builds in parallel. It also means
that analysis isn't rerun twice every time you run the script.

Bug: 307824623
Test: Using it for the past few genrules I've fixed
Change-Id: Ib3be394f233b383c1bba41d31ada6c9af94e755b
2023-11-15 11:44:12 -08:00
Colin Cross
69452e14a3 Split *ModuleContext out of module.go
Move EarlyModuleContext, BaseModuleContext and ModuleContext out of
module.go and into early_module_context, base_module_context and
module_context.go respectively.

Test: builds
Change-Id: I52e6eb1589d1478233c1c55d770b395a16eaa1a3
2023-11-15 11:40:49 -08:00
Colin Cross
a644c263dd Stop collecting path entry for module_bp_java_deps.json from each module type
The jdepsGeneratorSingleton can get the module path directly, it doesn't
need to be collected by each module type that implements IDEInfo.  Fixes
module types (like android_library) that didn't reach the code that
collected the path.

Bug: 309835196
Test: out/soong/module_bp_java_deps.json contains path for ExtServices.core
Change-Id: If8cb81b4f708e0367f156ade164bee253bf53492
2023-11-15 11:40:48 -08:00
Cole Faust
9233d67c60 Sandbox ControlEnvProxyServerProto
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py ControlEnvProxyServerProto_cc ControlEnvProxyServerProto_h
Change-Id: Ie603894cf39112e641a23dad5d7d52fef96755da
2023-11-15 11:31:02 -08:00
Cole Faust
9844817148 Sandbox opengl genrules
These work fine with sandboxing, I'm not sure why they were added
to the list.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py egl_extensions_functions_hdr egl_functions_hdr gles1_core_functions_hdr gles1_extensions_functions_hdr gles2_core_functions_hdr gles2_extensions_functions_hdr gles31_only_functions_hdr gles3_only_functions_hdr
Change-Id: Ib179322f5b828dc85fccf9c0d1bacaad3fd359bf
2023-11-15 11:15:20 -08:00
Jihoon Kang
404bf92c95 Merge "Add environment variable BUILD_FROM_SOURCE_STUB" into main am: 37d679df33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2831230

Change-Id: I6562f7e2aa48f6eac0e96b5576e6da8337e08fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:03:57 +00:00
Jihoon Kang
37d679df33 Merge "Add environment variable BUILD_FROM_SOURCE_STUB" into main 2023-11-15 16:29:12 +00:00
Ivan Lozano
08fb62b96a Merge "rust: Allow no_stdlibs per-target variants." into main am: 5ade28cb31
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2829091

Change-Id: I16c63580853ae75f531c393c27f9c59046dbecee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 15:40:27 +00:00
Ivan Lozano
5ade28cb31 Merge "rust: Allow no_stdlibs per-target variants." into main 2023-11-15 15:18:29 +00:00
Aditya Choudhary
beff7f2a0a Merge "Add proto for Test ownership metadata." into main am: d97bf36469
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774872

Change-Id: Idae0ffe939cb25b9c8626a39d036535691ee38f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 11:19:37 +00:00
Aditya Choudhary
d97bf36469 Merge "Add proto for Test ownership metadata." into main 2023-11-15 10:30:50 +00:00
Aditya Choudhary
9b59352a82 Add proto for Test ownership metadata.
This Cl adds a new rule to Soong to generate test spec metadata. Also, this CL adds a provider in various test module to provide test spec related data to the Soong rule.
Will add providers and test code to other Module in the future changes.
Provider added for the following test modules in this change: android_robolectric_test, android_test, bootclasspath_fragment_test, java_test, java_test_host, python_test, python_test_host, sh_test,and sh_test_host.

Bug: 296873595

Change-Id: I5f89f72d5874bb7838ae357efdb8c6ca208e18a7
2023-11-15 09:08:02 +00:00
Treehugger Robot
244f79d64a Merge "Sandbox nondeterministic genrules" into main am: 5876a78543
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828462

Change-Id: I7b30cc92d413fcfdf0caeeebae0b39b8915072f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 05:10:51 +00:00
Jooyung Han
838002455d Merge "Use vendor_file for vendor apex root" into main am: 7c22416af4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2829510

Change-Id: I6b713dc9f56a037decbe43d5dd935b06de74fe00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 05:10:36 +00:00
Treehugger Robot
5876a78543 Merge "Sandbox nondeterministic genrules" into main 2023-11-15 04:56:45 +00:00
Jooyung Han
7c22416af4 Merge "Use vendor_file for vendor apex root" into main 2023-11-15 04:36:41 +00:00
Cole Faust
2bfbb850c2 Sandbox nondeterministic genrules
These genrules are nondeterministic even without sandboxing, which
caused genrule_sandbox_test.py to think that they didn't work with
sandboxing.

Bug: 307824623
Test: m aidl_camera_build_version apexer_test_host_tools authfs_test_apk_assets common-profile-text-protos core-tests-smali-dex futility_cmds gen_corrupt_superblock_apex gen_manifest_mismatch_apex_no_hashtree generate_hash_v1 lib-test-profile-text-protos libmojo_jni_headers measure_io_as_jar PackageManagerServiceServerTests_apks_as_resources pandora-python-gen-src sample-profile-text-protos services.core.protologsrc statsd-config-protos temp_layoutlib vm-tests-tf-lib vts_vndk_abi_dump_zip wm_shell_protolog_src wmtests.protologsrc
Change-Id: I289decc2ac85d45b4c0f930171145553e477b1dd
2023-11-14 18:28:46 -08:00