Commit graph

76297 commits

Author SHA1 Message Date
Treehugger Robot
6b7fff1b54 Merge "Enable sandboxing for pigweed gnerules" into aosp-main-future 2023-11-22 20:53:27 +00:00
Matthew Maurer
7a9add567b Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main am: b103659c0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839054

Change-Id: Iee1f31750001f2f7b6b2f23c9368380c7d95bf96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 20:51:18 +00:00
Matthew Maurer
b103659c0b Merge changes I0caddbf6,Iee20b060,I6c92580b,I45028945,Ia7dd5220, ... into main
* changes:
  rust: Resolve crate roots outside rust-project
  rust: Cache crateRootPath to avoid ctx
  rust: internalize srcPathFromModuleSrcs
  rust: move crateRootPath to compiler
  rust: Privatize Cargo* methods on compiler
  rust: Move compiler interface to compiler.go
2023-11-22 20:37:27 +00:00
Cole Faust
58de780771 Sandbox atest_integration_fake_src am: f7474880a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842066

Change-Id: Ib1dceb07294f3b9077d36dc569be7a5de3695dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 20:18:14 +00:00
Cole Faust
28e46107cf Sandbox trout genrules
These were fixed in aosp/2838463, aosp/2839595, pa/2668052, and
pa/2668054.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py TracingVMProtoStub_cc TracingVMProtoStub_h VehicleServerProtoStub_cc@default-grpc VehicleServerProtoStub_cc@2.0-grpc-trout VehicleServerProtoStub_h@2.0-grpc-trout VehicleServerProtoStub_h@default-grpc
Change-Id: I9d21d608773e2974f8fca8af4dd16a654e8eb128
2023-11-22 12:09:27 -08:00
Cole Faust
eda7420e0e Enable sandboxing for pigweed gnerules
go/roboleaf-busy-beavers-sandboxing

Ignore-AOSP-First: these modules only exist on internal
Bug: 307824623
Test: m pw_log_log_proto_pwpb_h pw_log_log_raw_rpc_h pw_log_log_rpc_pwpb_h pw_tokenizer_proto_options_pwpb_h
Change-Id: I5f4c68657a9440a3db339e7a51a4714c3bc5df55
(cherry picked from commit 50005b08c2)
2023-11-22 19:30:18 +00:00
Cole Faust
f7474880a1 Sandbox atest_integration_fake_src
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py atest_integration_fake_src
Change-Id: Ib3ae70b877227df794fec5516a754a9c32b06637
2023-11-22 11:07:06 -08:00
Inseob Kim
87230e613d Add defaults modules for avb modules
Bug: 302465542
Test: build
Change-Id: I5bb5a0241d40cf142ed8bbefb76bc8a3709c3e34
2023-11-22 18:55:46 +09:00
Inseob Kim
fb1d783e07 Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836495

Change-Id: I02084dd3d6c5e9039ce9b9f53942c21422c84d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 07:55:30 +00:00
Inseob Kim
6a4bb378df Merge "Allow apex to use generated file_contexts" into main 2023-11-22 07:45:53 +00:00
Yi Kong
817aea043a Merge "Remove unneeded MLGO cflag" into main am: 78a456e771
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2839803

Change-Id: I60df6de321df974fb7277141ca6919ea4abd9f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 06:19:00 +00:00
Yi Kong
78a456e771 Merge "Remove unneeded MLGO cflag" into main 2023-11-22 06:06:47 +00:00
Yi Kong
8fb0b498db Remove unneeded MLGO cflag
For LTO compilation, we do not need MLGO flags in cflags, since codegen
happens during link only.

Fixes compiler warnings for unused command line argument.

Test: presubmit
Change-Id: I361e4292b10a3582fd5c69fa7b5678c654b44a0f
2023-11-22 06:06:36 +00:00
Treehugger Robot
6653229186 Merge "Sandbox MultiDexLegacyTestApp_genrule and android-cts-verifier" into main am: 917ea12077
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841997

Change-Id: Iad8288b4e1971926f5532a9caa8159f6db4b3810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 06:04:46 +00:00
Treehugger Robot
917ea12077 Merge "Sandbox MultiDexLegacyTestApp_genrule and android-cts-verifier" into main 2023-11-22 05:56:46 +00:00
Seungjae Yoo
9f263710ff Support adding AVB properties into vbmeta module
Bug: 285855436
Test: m

Change-Id: I5b0e14783ac927365dd98718bf399e94ab76aa13
2023-11-22 13:00:25 +09:00
Treehugger Robot
baed9d5a57 Merge "Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test" into main am: 9be9a126d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841420

Change-Id: I5b7d56846f7bac5b4a77745e8638ce2412aaa935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22 02:06:49 +00:00
Cole Faust
0931c29463 Sandbox tflite-support genrules
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py tflite_support_metadata_schema tflite_support_spm_config tflite_support_spm_encoder_config
Change-Id: Iab64f9f3125977685a5aa1ccffb093a68e4ac68b
2023-11-21 18:00:38 -08:00
Cole Faust
4a0be5cc17 Sandbox MultiDexLegacyTestApp_genrule and android-cts-verifier
These both work with sandboxing already, I'm not sure why they
were added to this list.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py android-cts-verifier MultiDexLegacyTestApp_genrule
Change-Id: Ie5a194fbe202b84a30eb3738d07ffb4ec9061bca
2023-11-21 17:04:24 -08:00
Matthew Maurer
db72f7ed80 rust: Resolve crate roots outside rust-project
Previously, we manually re-computed crate roots inside project_json for
rendering rust-project.json. In addition to added complexity, this meant
that generated sources and glob sources would not render correctly - it
would select e.g. `src/**.rs` or `:foo` as a crate root.

Use a centralized computation of crate roots instead.

Bug: 309943184
Test: SOONG_GEN_RUST_PROJECT=1 m nothing, compare rust-project.json
Change-Id: I0caddbf600d025a0041f45e69812cdd6f1761234
2023-11-22 00:52:34 +00:00
Matthew Maurer
a28404a7b0 rust: Cache crateRootPath to avoid ctx
This makes it possible to call crateRootPath in situations where a
ModuleContext is unavailable.

Test: m nothing
Bug: 309943184
Change-Id: Iee20b0606954a18ca516cdac40917d0016f94a05
2023-11-22 00:52:14 +00:00
Matthew Maurer
1d8e20d744 rust: internalize srcPathFromModuleSrcs
This was frequently misused (for example, in the prebuilts module, it
was used as a complex "assert(len(srcs))==1"), and can be superceded by
getCrateRoot anywhere it was used. It's now only called from
compiler.go, and can drop the second return parameter, as it was only
actually used by the prebuilt assert misuse.

Bug: 309943184
Test: m nothing
Change-Id: I6c92580bc8f0ecb7586c544056b5409e6dd280e7
2023-11-22 00:52:10 +00:00
Treehugger Robot
9be9a126d1 Merge "Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test" into main 2023-11-22 00:44:03 +00:00
Cole Faust
cf783384d5 Sandbox cronet genrules
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py cronet_aml_base_allocator_buildflags cronet_aml_base_allocator_buildflags__testing cronet_aml_base_allocator_partition_allocator_chromecast_buildflags cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__testing cronet_aml_base_allocator_partition_allocator_chromeos_buildflags cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__testing cronet_aml_base_allocator_partition_allocator_debugging_buildflags cronet_aml_base_allocator_partition_allocator_debugging_buildflags__testing cronet_aml_base_allocator_partition_allocator_logging_buildflags cronet_aml_base_allocator_partition_allocator_logging_buildflags__testing cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__testing cronet_aml_base_anchor_functions_buildflags cronet_aml_base_anchor_functions_buildflags__testing cronet_aml_base_android_runtime_jni_headers cronet_aml_base_android_runtime_jni_headers__testing cronet_aml_base_android_runtime_unchecked_jni_headers cronet_aml_base_android_runtime_unchecked_jni_headers__testing cronet_aml_base_base_android_java_enums_srcjar cronet_aml_base_base_jni_headers cronet_aml_base_base_jni_headers__testing cronet_aml_base_build_date cronet_aml_base_build_date__testing cronet_aml_base_cfi_buildflags cronet_aml_base_cfi_buildflags__testing cronet_aml_base_clang_profiling_buildflags cronet_aml_base_clang_profiling_buildflags__testing cronet_aml_base_debugging_buildflags cronet_aml_base_debugging_buildflags__testing cronet_aml_base_feature_list_buildflags cronet_aml_base_feature_list_buildflags__testing cronet_aml_base_ios_cronet_buildflags cronet_aml_base_ios_cronet_buildflags__testing cronet_aml_base_java_features_srcjar cronet_aml_base_java_switches_srcjar cronet_aml_base_logging_buildflags cronet_aml_base_logging_buildflags__testing cronet_aml_base_message_pump_buildflags cronet_aml_base_message_pump_buildflags__testing cronet_aml_base_orderfile_buildflags cronet_aml_base_orderfile_buildflags__testing cronet_aml_base_power_monitor_buildflags cronet_aml_base_power_monitor_buildflags__testing cronet_aml_base_profiler_buildflags cronet_aml_base_profiler_buildflags__testing cronet_aml_base_rust_buildflags cronet_aml_base_rust_buildflags__testing cronet_aml_base_sanitizer_buildflags cronet_aml_base_sanitizer_buildflags__testing cronet_aml_base_synchronization_buildflags cronet_aml_base_synchronization_buildflags__testing cronet_aml_base_test_base_unittests_jni_headers__testing cronet_aml_base_test_test_support_jni_headers__testing cronet_aml_base_tracing_buildflags cronet_aml_base_tracing_buildflags__testing cronet_aml_build_android_build_config_gen cronet_aml_build_android_build_config_gen_rename cronet_aml_build_android_native_libraries_gen cronet_aml_build_blink_buildflags cronet_aml_build_blink_buildflags__testing cronet_aml_build_branding_buildflags cronet_aml_build_branding_buildflags__testing cronet_aml_build_chromecast_buildflags cronet_aml_build_chromecast_buildflags__testing cronet_aml_build_chromeos_buildflags cronet_aml_build_chromeos_buildflags__testing cronet_aml_build_config_compiler_compiler_buildflags cronet_aml_build_config_compiler_compiler_buildflags__testing cronet_aml_components_cronet_android_buildflags cronet_aml_components_cronet_android_buildflags__testing cronet_aml_components_cronet_android_cronet_jni_headers cronet_aml_components_cronet_android_cronet_jni_headers__testing cronet_aml_components_cronet_android_cronet_jni_registration cronet_aml_components_cronet_android_cronet_jni_registration__java cronet_aml_components_cronet_android_cronet_jni_registration__java__testing cronet_aml_components_cronet_android_cronet_jni_registration__testing cronet_aml_components_cronet_android_cronet_tests_jni_headers__testing cronet_aml_components_cronet_android_http_cache_type_java cronet_aml_components_cronet_android_implementation_api_version cronet_aml_components_cronet_android_integrated_mode_state cronet_aml_components_cronet_android_integrated_mode_state_rename cronet_aml_components_cronet_android_interface_api_version cronet_aml_components_cronet_android_load_states_list cronet_aml_components_cronet_android_load_states_list_rename cronet_aml_components_cronet_android_net_idempotency_java cronet_aml_components_cronet_android_net_request_priority_java cronet_aml_components_cronet_android_network_quality_observation_source_java cronet_aml_components_cronet_android_request_context_config_java_proto__protoc_java cronet_aml_components_cronet_android_request_context_config_proto__testing_gen cronet_aml_components_cronet_android_request_context_config_proto__testing_gen_headers cronet_aml_components_cronet_android_request_context_config_proto_gen cronet_aml_components_cronet_android_request_context_config_proto_gen_headers cronet_aml_components_cronet_android_rtt_throughput_values_java cronet_aml_components_cronet_android_url_request_error_java cronet_aml_components_cronet_cronet_buildflags cronet_aml_components_cronet_cronet_buildflags__testing cronet_aml_components_cronet_cronet_version_header_action cronet_aml_components_cronet_cronet_version_header_action__testing cronet_aml_components_prefs_android_jni_headers cronet_aml_components_prefs_android_jni_headers__testing cronet_aml_crypto_buildflags cronet_aml_crypto_buildflags__testing cronet_aml_net_android_net_android_java_enums_srcjar cronet_aml_net_android_net_errors_java cronet_aml_net_android_net_errors_java_rename cronet_aml_net_base_registry_controlled_domains_lookup_strings_test_sets__testing cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains__testing cronet_aml_net_buildflags cronet_aml_net_buildflags__testing cronet_aml_net_cronet_buildflags cronet_aml_net_cronet_buildflags__testing cronet_aml_net_effective_connection_type_java cronet_aml_net_http_transport_security_state_unittest_data__testing cronet_aml_net_http_transport_security_state_unittest_data_default__testing cronet_aml_net_isolation_info_proto__testing_gen cronet_aml_net_isolation_info_proto__testing_gen_headers cronet_aml_net_isolation_info_proto_gen cronet_aml_net_isolation_info_proto_gen_headers cronet_aml_net_net_jni_headers cronet_aml_net_net_jni_headers__testing cronet_aml_net_net_nqe_proto__testing_gen cronet_aml_net_net_nqe_proto__testing_gen_headers cronet_aml_net_net_nqe_proto_gen cronet_aml_net_net_nqe_proto_gen_headers cronet_aml_net_net_test_jni_headers__testing cronet_aml_net_third_party_quiche_net_quic_proto__testing_gen cronet_aml_net_third_party_quiche_net_quic_proto__testing_gen_headers cronet_aml_net_third_party_quiche_net_quic_proto_gen cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen cronet_aml_net_third_party_quiche_net_quic_test_tools_proto__testing_gen_headers cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers cronet_aml_testing_android_native_test_native_test_jni_headers__testing cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen cronet_aml_third_party_metrics_proto_metrics_proto__testing_gen_headers cronet_aml_third_party_metrics_proto_metrics_proto_gen cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen cronet_aml_third_party_quic_trace_quic_trace_proto__testing_gen_headers cronet_aml_url_buildflags cronet_aml_url_buildflags__testing cronet_aml_url_url_jni_headers cronet_aml_url_url_jni_headers__testing cronet_tester_app_jni cronet_net_tester_app_jni cronet_java_tests_jni statslog-cronet-java-gen
Change-Id: I9e529684fa80a35981ed784f3bd6d622940dbd28
2023-11-21 16:28:59 -08:00
Cole Faust
d4ca3aaf20 Merge "Sandbox vndk_abi_dump_zip" into main am: 852b82e5c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842057

Change-Id: Ic6be6b6e8982c7ce1a99386b9fdec5e8e22efc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 23:57:45 +00:00
Pirama Arumuga Nainar
d6165f813c Merge "Revert "Remove flags rejected by RBE input processor"" into main am: d03958d457
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841994

Change-Id: I8054abc5235be6aaa6d573ec816e38a5486ef22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 23:57:33 +00:00
Cole Faust
42a737da5c Merge "Sandbox awkgram.tab.h" into main am: 1f6fb9b419
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841996

Change-Id: I1f6a86649070ffef63ec3c9118c16ac088a43f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 23:57:05 +00:00
Cole Faust
852b82e5c2 Merge "Sandbox vndk_abi_dump_zip" into main 2023-11-21 23:53:56 +00:00
Pirama Arumuga Nainar
d03958d457 Merge "Revert "Remove flags rejected by RBE input processor"" into main 2023-11-21 23:45:12 +00:00
Cole Faust
1f6fb9b419 Merge "Sandbox awkgram.tab.h" into main 2023-11-21 23:36:42 +00:00
Treehugger Robot
eb9ea4ba54 Merge "Sandbox emp_ematch genrules" into main am: 964a084264
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842055

Change-Id: I7a8dbca8ca4bd920bfbb7df630af3827a5de52f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 23:36:33 +00:00
Colin Cross
a16bd6b714 Don't write license data to Android-${TARGET_PRODUCT}.mk
All the necessary license data is already propagated through the license
metadata file, and the entries in Android-${TARGET_PRODUCT}.mk are not
used.  Remove them, which should both reduce the size and parsing cost
of the Android-${TARGET_PRODUCT}.mk file and also removes a variable
that changes when dependencies are added or removed, which will
eventually allow running kati less often.

Bug: 309006256
Test: No change to out/Android-aosp_cf_x86_64_phone.ninja
Change-Id: Idfeb6fd10d77497ca274f8e74fe8e994ce1cafe6
2023-11-21 15:27:44 -08:00
Treehugger Robot
964a084264 Merge "Sandbox emp_ematch genrules" into main 2023-11-21 23:22:03 +00:00
Aditya Choudhary
356296240e Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test
Bug: 312536783
Bug: 312536905
Test: m nothing --no-skip-soong-tests -j96

Change-Id: I1e12281927269d42ae796348b223030acfd6ecfa
2023-11-21 23:14:01 +00:00
Treehugger Robot
df89d0cd92 Merge "Sandbox angle_commit_id" into main am: 024adceb24
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842056

Change-Id: Ib85a8e20260c4517965d88c126038f251aaac0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 22:49:36 +00:00
Cole Faust
2826870306 Merge "Sandbox c2hal_test_genc++[_headers]" into main am: b12a98651d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2842054

Change-Id: Ieb966eedb7f872dc28bf2a2d1f971ce0fb902a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 22:49:25 +00:00
Treehugger Robot
68e5138235 Merge "Sandbox libchrome genrules" into main am: 23abfe7291
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841995

Change-Id: I912a9278500887f290e531d1ec6828b5f6b8bb80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 22:47:33 +00:00
Treehugger Robot
024adceb24 Merge "Sandbox angle_commit_id" into main 2023-11-21 22:47:23 +00:00
Cole Faust
ae36d6b964 Sandbox awkgram.tab.h
Sandboxing it generates this diff:

  38,39c38,39
  < #ifndef YY_YY_OUT_SOONG_TEMP_SBOX_794A09CEE4E110D9FF38139A8943928FFD7288A5_OUT_AWKGRAM_TAB_H_INCLUDED
  < # define YY_YY_OUT_SOONG_TEMP_SBOX_794A09CEE4E110D9FF38139A8943928FFD7288A5_OUT_AWKGRAM_TAB_H_INCLUDED
  ---
  > #ifndef YY_YY_OUT_AWKGRAM_TAB_H_INCLUDED
  > # define YY_YY_OUT_AWKGRAM_TAB_H_INCLUDED
  280c280
  < #endif /* !YY_YY_OUT_SOONG_TEMP_SBOX_794A09CEE4E110D9FF38139A8943928FFD7288A5_OUT_AWKGRAM_TAB_H_INCLUDED  */
  ---
  > #endif /* !YY_YY_OUT_AWKGRAM_TAB_H_INCLUDED  */

Which is acceptable, the ifdef is based on the path to the file and
just there to prevent duplicate imports.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py awkgram.tab.h
Change-Id: I85c5e0f65e97d18f1aa8b36fa6b19402d2da6c8c
2023-11-21 14:18:27 -08:00
Cole Faust
b12a98651d Merge "Sandbox c2hal_test_genc++[_headers]" into main 2023-11-21 22:08:31 +00:00
Cole Faust
763710ca78 Sandbox vndk_abi_dump_zip
Sandboxing it generates this diff in it's output zip file:

  1,4c1,2
  < Archive:  out_not_sandboxed/soong/.intermediates/prebuilts/abi-dumps/vndk/vndk_abi_dump_zip/gen/vndk_abi_dump.zip
  < Zip file size: 319522663 bytes, number of entries: 7462
  < -rw-r--r--  2.0 unx     1055 bl      612 defN 08-Jan-01 00:00 Android.bp
  < -rw-r--r--  2.0 unx      143 bl       99 defN 08-Jan-01 00:00 OWNERS
  ---
  > Archive:  out/soong/.intermediates/prebuilts/abi-dumps/vndk/vndk_abi_dump_zip/gen/vndk_abi_dump.zip
  > Zip file size: 319519888 bytes, number of entries: 7454
  6810d6807
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/arm/source-based/config.json
  6926d6922
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/arm64/source-based/config.json
  7042d7037
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/arm_arm64/source-based/config.json
  7158d7152
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/x86/source-based/config.json
  7274d7267
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/x86_64/source-based/config.json
  7390d7382
  < -rw-r--r--  2.0 unx      722 bl      142 defN 08-Jan-01 00:00 34/64/x86_x86_64/source-based/config.json
  7465c7457
  < 7462 files, 5412913325 bytes uncompressed, 317891705 bytes compressed:  94.1%
  ---
  > 7454 files, 5412907795 bytes uncompressed, 317890142 bytes compressed:  94.1%

So sandboxing removes some files from the zip. It appears that the
intention of this zip file was to include a bunch of .lsdump files,
and these files that were removed were extraneous.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py vndk_abi_dump_zip
Change-Id: I15df4a4b54df362c30e2b231f6fed586cf0a267f
2023-11-21 14:04:52 -08:00
Treehugger Robot
23abfe7291 Merge "Sandbox libchrome genrules" into main 2023-11-21 22:04:03 +00:00
Cole Faust
babb750cdf Sandbox angle_commit_id
Sandboxing it generates this diff:

  1c1
  < #define ANGLE_COMMIT_HASH "1f7a2ce0bf57"
  ---
  > #define ANGLE_COMMIT_HASH "unknown hash"
  3,4c3,4
  < #define ANGLE_COMMIT_DATE "2023-11-17 17:33:59 +0000"
  < #define ANGLE_COMMIT_POSITION 26027
  ---
  > #define ANGLE_COMMIT_DATE "unknown date"
  > #define ANGLE_COMMIT_POSITION 0

These constants appear to be unused, and we don't really want the build
to inspect the git history, so just let them be unkown.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py angle_commit_id
Change-Id: I3e35af14d13142927ded9477e975576d7324c6b7
2023-11-21 13:56:27 -08:00
Cole Faust
8d99fa4d9d Sandbox emp_ematch genrules
These genrules already work with sandboxing, but bison emits #line
directives that reference filepaths. These paths differ between
sandboxed and non-sandboxed builds, which caused
genrule_sandboxing_test.py to think that they didn't work with
sandboxing.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py emp_ematch.yacc.c emp_ematch.yacc.h
Change-Id: I85ed0f80dee7997af6b08a37b12e9c0ad0bd8386
2023-11-21 13:28:42 -08:00
Cole Faust
e5d9c8d5f7 Sandbox c2hal_test_genc++[_headers]
These genrules already work with sandboxing, I'm not sure why they
were added to the list.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py c2hal_test_genc++_headers c2hal_test_genc++
Change-Id: I697c9cff1db0bf71b3608684fde73535a72f71b2
2023-11-21 12:50:57 -08:00
Cole Faust
6753118f49 Sandbox libchrome genrules
These genrules already work with sandboxing, but they write the path
to a tool into a comment in their outputs, which differs between
sandboxing and non-sandboxing builds. This made genrule_sandbox_test.py
think that they didn't work with sandboxing.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py libchrome-include libchrome-crypto-include
Change-Id: Ibcad839e9d374a2f992d051805548c58303cf7ef
2023-11-21 12:40:34 -08:00
Aditya Choudhary
e5d9515fe3 Merge "Set testModule to true in cc.NewTest()." into main am: c400022f0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841416

Change-Id: I30dbb9fddbc140b78bfd8bd5bd6086507be6d0f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 20:01:41 +00:00
Pirama Arumuga Nainar
6c771e7d29 Revert "Remove flags rejected by RBE input processor"
This reverts commit a4724a0c4e.

Reason for revert: reclient has an updated deps scanner now.
Bug: http://b/248371171
Test: enable RBE; RBE_CLANG_TIDY_EXEC_STRATEGY=remote; make tidy-soong_subset


(cherry picked from https://android-review.googlesource.com/q/commit:2c36e5efceae94424b513878cf6dc4e9640651ab)
Merged-In: Id876bd7eee1e5606f8dc05903f77f135b47da360
Change-Id: Id876bd7eee1e5606f8dc05903f77f135b47da360
2023-11-21 19:54:27 +00:00
Aditya Choudhary
c400022f0a Merge "Set testModule to true in cc.NewTest()." into main 2023-11-21 19:53:53 +00:00
Aditya Choudhary
64b6c645e8 Add test for soong/testing/test_spec. am: b7b3de8307
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836072

Change-Id: Iec9eeceadbd2e86055a4f2e6eecd77443f7eb05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 19:44:34 +00:00