Commit Graph

76059 Commits

Author SHA1 Message Date
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
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
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
Cole Faust
032efaa7b6 Sandbox uwb genrules am: e492de0430
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828455

Change-Id: I5f9d0db71807ea6804d9661f0e18ae7fd590228e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 01:05:48 +00:00
Jihoon Kang
7c1958f0f4 Add environment variable BUILD_FROM_SOURCE_STUB
On top of the soong build flag --build-from-source-stub, the user can
configure build to generate stubs from source Java files by setting the
environment variable BUILD_FROM_SOURCE_STUB=true.

Test: m nothing
Bug: 310279899
Change-Id: I0c5247558455f09b8fc208d988aab3b60bf0ff16
2023-11-15 00:34:43 +00:00
Cole Faust
e492de0430 Sandbox uwb genrules
go/roboleaf-busy-beavers-sandboxing

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py gen_uwb_core_proto uwb_core_artifacts
Change-Id: Ie9070cd589fbd15c72723e8c1c57d69aaf7451d9
2023-11-14 11:58:19 -08:00
Alyssa Ketpreechasawat
4e56c8b8ac Merge "Skip unknown check in bootclasspath_fragment (source version) if prebuilt version is in use." into main am: 378c7a3953
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2822393

Change-Id: Ie94799e955a6dc3d4a31c2ea0376945a2982e8fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 19:44:58 +00:00
Treehugger Robot
2aa434264a Merge "Sandbox libtextclassifier genrules" into main am: 7dc019e8cb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2822954

Change-Id: I081c26a4f907bf242ba96dbc26842a8b52082cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 19:44:32 +00:00
Alyssa Ketpreechasawat
378c7a3953 Merge "Skip unknown check in bootclasspath_fragment (source version) if prebuilt version is in use." into main 2023-11-14 19:13:32 +00:00
Treehugger Robot
7dc019e8cb Merge "Sandbox libtextclassifier genrules" into main 2023-11-14 18:55:56 +00:00
Ivan Lozano
c518202e28 rust: Allow no_stdlibs per-target variants.
stdlibs can be set per-target, it makes to sense to allow no_stdlibs to
be set per-target as well.

Bug: 310924208
Test: Android.bp with per-target no_stdlibs builds.
Change-Id: I1c3a458a849367d2c363bd5f65af77b8cce8c0e0
2023-11-14 10:40:08 -05:00
Jooyung Han
fed9cce4b6 Use vendor_file for vendor apex root
It was 'vendor_apex_metadata_file', but root directories can be simply
labelled as 'vendor_file' so that linker can resolve paths in vendor
apexes.

Bug: 310528686
Test: m blueprint_tests
Change-Id: I689b23efccb7be61980e791e185fcef28a76d9bc
2023-11-14 13:52:51 +09:00
Spandan Das
b41b2c7b5f Merge "Remove redundant baseline apex_available entries" into main am: 6f9522e4a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828275

Change-Id: Idb95b9b0a2abefacecabbb1cf2fd3999ff93441d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 23:17:27 +00:00
Spandan Das
0a265f3bf2 Merge "Remove empty baseline apex_available maps" into main am: 896e3846a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828274

Change-Id: If0e7d2fcb88ad4c809c37cf4f49d51dcd139c2e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 23:17:15 +00:00
Spandan Das
6f9522e4a8 Merge "Remove redundant baseline apex_available entries" into main 2023-11-13 23:00:03 +00:00
Spandan Das
896e3846a4 Merge "Remove empty baseline apex_available maps" into main 2023-11-13 22:48:38 +00:00
Colin Cross
903ad5b9af Avoid conflicts between architectures in prebuilt_renderscript_bitcode am: 2f63457354
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2828730

Change-Id: I726b4689ca8de9cb814fc36d8890c8a6cf43d800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 21:55:12 +00:00
Spandan Das
39e21ee0dd Remove redundant baseline apex_available entries
These soong modules list the relevant apex_available values explicitly
in Android.bp files

Test: m nothing
Bug: 281077552
Change-Id: I7ec8e0f9d7ab7cbfb881d59d3e5d2bb8a2975ff8
2023-11-13 21:36:15 +00:00
Spandan Das
bf6f44167f Remove empty baseline apex_available maps
And com.android.appsearch since the lone entry in the map specifies
com.android.appsearch in its Android.bp file explicitly

Bug: 281077552
Test: m nothing
Change-Id: I0b7e37f0b6ace21d37c8b0077bacf83b49318744
2023-11-13 21:06:16 +00:00
Zi Wang
183a03f1b1 Merge "Add "exported" mode to xx_aconfig_library build rules" into main am: 692f54baeb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2825162

Change-Id: I184d7cb28576ef140eea6da48013dc416918baa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 20:15:07 +00:00
Colin Cross
2f63457354 Avoid conflicts between architectures in prebuilt_renderscript_bitcode
The NDK build has 4 architectures, x86 and arm 32-bit architectures and
x86_64 and arm64 64-bit architectures.  Multilib on its own is not
enough to prevent collisions in install locations.  Detect conflicts
and add the architecture to the path the same way cc/installer.go does.

Bug: 308212344
Test: OUT_DIR=out build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: If7a1b062035dda87f5f8129062778c41c43de17b
2023-11-13 12:12:06 -08:00
Zi Wang
692f54baeb Merge "Add "exported" mode to xx_aconfig_library build rules" into main 2023-11-13 19:23:55 +00:00
Treehugger Robot
a5465c71f1 Merge "Sandbox openwrt genrules" into main am: fa10b620c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2824829

Change-Id: I4737c3935ba4a342fa760d2c21517b1014618d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:10:45 +00:00
Treehugger Robot
fa10b620c1 Merge "Sandbox openwrt genrules" into main 2023-11-13 18:33:19 +00:00
Zi Wang
275f654a2e Add "exported" mode to xx_aconfig_library build rules
Test: added unit tests and CI

Bug: 309990433
Change-Id: Iae1b85265d9780bde7d41ec2ec6e8e441c2b3814
2023-11-13 10:23:55 -08:00
Treehugger Robot
18e3e0d5ba Merge "Allow Ravenwood to cross variant boundaries" into main am: 3a35d64915
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2826913

Change-Id: I97d1c36f464d81ded11098f568228c0c257fc822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 17:48:09 +00:00
Treehugger Robot
3a35d64915 Merge "Allow Ravenwood to cross variant boundaries" into main 2023-11-13 17:11:30 +00:00
Cole Faust
1a1dec945c Sandbox pdl genrules am: a215c8bdb9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2824828

Change-Id: I08f98cfe28bc68a75ded50bd688cd7150e679987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 02:30:37 +00:00
Cole Faust
653f9bacda Sandbox openwrt genrules
These genrules have non-deterministic outputs even without sandboxing.
Though I couldn't easily figure out where the nondeterminism is coming
from.

Bug: 307824623
Test: Presubmits
Change-Id: Ia60c6fae164a1f66cad2e19ccaab7d178905f2a4
2023-11-10 17:42:31 -08:00
Treehugger Robot
ed4570f252 Merge "Sandbox bluetooth genrules" into main am: 064bbf77fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2825629

Change-Id: Ia3a0a5c3fb1fc52f3f8c480e06bd6f34e8e1d6ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 00:48:17 +00:00
Cole Faust
a215c8bdb9 Sandbox pdl genrules
Like in aosp/2825629, these genrules right the command used to
generate their files to the files themselves, which differs between
sandboxed/non-sandboxed invocations and caused genrule_sandbox_test.py
to think that sandboxing caused meaningful differences.

Bug: 307824623
Test: Presubmits
Change-Id: I248de8a45ab03a498297a026250d6f0b7c838e25
2023-11-10 16:28:27 -08:00
Makoto Onuki
b66bba3a3c Allow Ravenwood to cross variant boundaries
Bug: 310268946
Bug: 292141694
Test: atest RavenwoodMockitoTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:43b648195bcf62f62cae5547f73b247c278e1883)
Merged-In: Ia395d32bad57007ec477a6410dcc4201853c8790
Change-Id: Ia395d32bad57007ec477a6410dcc4201853c8790
2023-11-11 00:13:14 +00:00
Treehugger Robot
064bbf77fe Merge "Sandbox bluetooth genrules" into main 2023-11-11 00:03:55 +00:00