Commit Graph

66239 Commits

Author SHA1 Message Date
Wei Li
956ff8932d Merge "Exclude diffs caught by sbom_test." am: 40c224656e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2606485

Change-Id: I4790a38b1fce8c007c64d9bcf6f6ae4143361d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 06:25:07 +00:00
Wei Li
40c224656e Merge "Exclude diffs caught by sbom_test." 2023-05-26 05:42:09 +00:00
Jingwen Chen
289d6fa44f Merge "Add jihoonkang and mrziwang to OWNERS" am: d261085999
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2606486

Change-Id: If81d49a0ce633bedbad89f967538cf1854d7835d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 02:43:34 +00:00
Jingwen Chen
d261085999 Merge "Add jihoonkang and mrziwang to OWNERS" 2023-05-26 02:04:55 +00:00
Cory Barker
9d348c734a Merge "Add both classes jar and dexed jar to java_fuzz module packaged output for dist as we move towards instrumentation at runtime" am: 70b2292646
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2604126

Change-Id: I418d374de318caa4e01a1f1d85bffcb082925771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26 00:46:03 +00:00
Saagar Jha
f513b23ac4 Replace prodcertstatus with gcertstatus
Prodaccess is apparently deprecated now.

Test: Build with/without credentials and check that it works

Change-Id: Iaadaebe84fe9531b2d7d5f0d265751462bb827d8
2023-05-26 00:23:50 +00:00
Spandan Das
85b7932892 Add jihoonkang and mrziwang to OWNERS
Test: N/A
Change-Id: I39145a7115e8e3bda4fb4cb92561742089ad2414
2023-05-26 00:10:25 +00:00
Wei Li
704146094a Exclude diffs caught by sbom_test.
Bug: 284279034
Test: build/soong/tests/sbom_test.sh
Change-Id: I152c2e2c55b6547b2dddf7b1b2524681c9af952e
2023-05-25 16:29:20 -07:00
Cory Barker
70b2292646 Merge "Add both classes jar and dexed jar to java_fuzz module packaged output for dist as we move towards instrumentation at runtime" 2023-05-25 23:26:28 +00:00
Jihoon Kang
32e0f45475 Merge "Modify error emit condition for checking api files in java_api_library" am: de68c07ce5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2604545

Change-Id: Ic79628b2e176ad04c2bc5eacfc74edf0bb5a110c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 22:04:40 +00:00
Jihoon Kang
de68c07ce5 Merge "Modify error emit condition for checking api files in java_api_library" 2023-05-25 21:09:40 +00:00
Treehugger Robot
792ae07605 Merge "Open metrics visibility to script subpackages" am: 0cf043fd48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2603247

Change-Id: I313fe53d30d6eb3863d402712a27b7fb3ed899c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 19:48:55 +00:00
Treehugger Robot
0cf043fd48 Merge "Open metrics visibility to script subpackages" 2023-05-25 18:58:37 +00:00
Sam Delmerico
b1daccdc97 ensure that privapp_allowlist is installed before android_app
AndroidMk assumes that the app is the last file installed, and it uses
this assumption to populate the LOCAL_SOONG_INSTALLED_MODULE entry. This
CL moves the privapp_allowlist installation to before the app
installation to respect this assumption.

Bug: 242509786
Test: go test
Test: OUT_DIR=out.ref m nothing &&
  cp aosp/2562351 && OUT_DIR=out.change m nothing &&
  GOWORK=$PWD/build/bazel/mkcompare/go.work \
  go run android/bazel/mkcompare/cmd -json \
  <(sed -e "s/out\.ref/out/g" out.ref/soong/Android-aosp_cheetah.mk) \
  <(sed -e "s/out\.change/out/g" out.change/soong/Android-aosp_cheetah.mk)
  && verify manually that the only diffs are related to the removal of
  the prebuilt_etc module.
Change-Id: I95ec27070f575e79fb976de68493a219717ed89a
2023-05-25 18:54:06 +00:00
Treehugger Robot
b32ba61116 Merge "build: Fix bp2build panic issue" am: 51f09423fb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2601993

Change-Id: I0e6d37abc6eeb8bf42a6c3ba81a2064020b806a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 15:39:42 +00:00
Kousik Kumar
6324647bcc Remove env config fetcher code
This code is no longer needed since we are now setting USE_RBE to true
for 100% of users (except two users, who I'll reach out to over email).
So fetching the configuration is no longer needed since sometimes this
can result in RBE config flipping between on and off (depending on
whether you have gcert or not).

Tested: Ran the build with latest sync and ensured RBE was used for the
build.

Bug: b/283828386
Change-Id: I3cda78607b46a0e161b7841560dc587a44d91f27
2023-05-25 15:23:29 +00:00
Treehugger Robot
51f09423fb Merge "build: Fix bp2build panic issue" 2023-05-25 14:47:52 +00:00
Jihoon Kang
160634ca3d Modify error emit condition for checking api files in java_api_library
java_api_library currently emits error based when the
java_api_contribution module has an empty api file or when the module
does not have any api files. This may be problematic in partial
manifests where allow missing dependency is set, thus add this condition
for error emission.

Test: go test ./java
Bug: 284212875
Change-Id: I10b4baa5723e7a53d931823b3029ea20ac731911
2023-05-25 05:28:29 +00:00
Kiyoung Kim
a37d9baa96 Rename build.ninja with product name
Current build.ninja does not contain any product name, while other ninja
files (such as combined ninja) do. This change adds product name to the
build.ninja so it can be separated over multiple lunch targets

Bug: 277029044
Test: build succeeded and checked if out/soong/build.ninja has been
renamed

Change-Id: I16dc71f829fd76f01b98da0d509a8e0ef6f62fa9
2023-05-25 10:09:45 +09:00
Cory Barker
c29c37a2c0 Add both classes jar and dexed jar to java_fuzz module packaged output for dist as we move towards instrumentation at runtime
Test: Built locally and tested pipeline
Bug: 283993246
Change-Id: I69eb98d2b7966d77ac8819348f7b99a7b18f40b6
2023-05-24 22:53:41 +00:00
Ivan Lozano
7f9d7cbb75 rust: Support sanitizers in rust_ffi modules
Don't automatically assume that HWASAN or ASAN is enabled if Fuzzer is
enabled.

Bug: 178365482
Test: m bluetooth_stack_with_facade
Test: SANITIZE_TARGET=fuzzer m bluetooth_stack_with_facade
Test: SANITIZE_TARGET=address m bluetooth_stack_with_facade
Test: SANITIZE_TARGET=hwaddress m bluetooth_stack_with_facade
Test: SANITIZE_TARGET="fuzzer address" m bluetooth_stack_with_facade
Test: SANITIZE_TARGET="fuzzer hwaddress" m bluetooth_stack_with_facade
Change-Id: Ief8c0f899837c5889a8035782616025f1b0d54e7
2023-05-24 20:15:52 +00:00
Treehugger Robot
1950843461 Merge "don't require package_name for non-override android_apps" am: 1a608b0b0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2590425

Change-Id: Iabecaa232248560c0c6a5dc1889dce4f6c5fce97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 19:32:20 +00:00
Treehugger Robot
9bf6bb55f4 Merge "simplify m clean" am: 873691ae99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2434094

Change-Id: I03cdad362642982a4f076e40409baa5c219e551f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 19:31:21 +00:00
Treehugger Robot
1a608b0b0a Merge "don't require package_name for non-override android_apps" 2023-05-24 18:47:33 +00:00
Treehugger Robot
873691ae99 Merge "simplify m clean" 2023-05-24 18:36:39 +00:00
Alix
b29a3cd2aa bp2build java_resources that only contain a filegroup
supports filegroup that specifies path property

Bug: 280860624
Test: built libauto_value_plugin
Change-Id: I9ed0b13e055beb92ba8090f6b5e88b9873c9ce61
2023-05-24 18:21:15 +00:00
Chris Parsons
24e9eec800 Open metrics visibility to script subpackages
Test: N/A
Change-Id: Iee750369efa9138d0a3ada74549dde239f87396f
2023-05-24 18:07:18 +00:00
Sam Delmerico
15809f8101 don't require package_name for non-override android_apps
For a non-override android_app, we can assume that the privapp_allowlist
already contains the correct package_name, and so we don't need to
overwrite it in this case.

Bug: 242509786
Test: go test
Merged-In: I0f137e34cae3478dc8b9178d138121ff1d936f07
Change-Id: I0f137e34cae3478dc8b9178d138121ff1d936f07
2023-05-24 11:09:31 -04:00
liulvping
4d11d10ce2 build: Fix bp2build panic issue
panic in top down mutator "bp2build_conversion_bp2build"
for module "foo".
reflect: call of reflect.Value.NumField on interface Value

Test: go test ./bp2build
Change-Id: I9ee460ca38a37c6a6c1a0787159fa5f38b852b55
2023-05-24 06:38:58 +00:00
Treehugger Robot
713bbad7bd Merge "Sandbox inputs to aidl rule in cc" am: cd4e6a609e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2592446

Change-Id: I581ab442134d58b97bbfe119bd4c3f151b22f624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 00:37:18 +00:00
Treehugger Robot
cd4e6a609e Merge "Sandbox inputs to aidl rule in cc" 2023-05-23 23:40:35 +00:00
Kun Niu
865d7f222d Merge "data_native_bins is only available in java_test_host, add java_test_host properties to java_defaults to make it's available in java_defaults as well." am: 50533df497
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2601325

Change-Id: Id9497de303c8da4038f3ecab14af4c470b502ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 22:48:41 +00:00
Kun Niu
50533df497 Merge "data_native_bins is only available in java_test_host, add java_test_host properties to java_defaults to make it's available in java_defaults as well." 2023-05-23 22:35:40 +00:00
Treehugger Robot
47d195c157 Merge "Run "plugins" singleton in parallel with the rest." am: ea2cafe21e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2601326

Change-Id: I0e0123e2a6d07e73c053f02fd1a8405f9ca990fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 22:07:54 +00:00
Treehugger Robot
31e0d547bc Merge "Remove GetPythonBinary request type" am: 0d149f4a4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2601345

Change-Id: I061b3f91e43486aa30fd78ecfa5852f8b25d4c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 22:07:34 +00:00
Treehugger Robot
ea2cafe21e Merge "Run "plugins" singleton in parallel with the rest." 2023-05-23 22:01:34 +00:00
Vinh Tran
4c2d3da52d Merge "Support sandboxing genrule" am: c1910c9e07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2584923

Change-Id: Ie0574d90d474e25835393880907dea2d5c35ee6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 21:47:27 +00:00
Treehugger Robot
6148a2fb00 Merge "Increase R8 max heap size to 4GB" am: 8d3df9beeb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2600791

Change-Id: Idae27855ced49c303dd24314a7bda532f1fbe689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 21:46:59 +00:00
Treehugger Robot
0d149f4a4f Merge "Remove GetPythonBinary request type" 2023-05-23 21:42:31 +00:00
Usta Shrestha
6e1aa7830c simplify m clean
`rm -rf out` used to fail because bazel would not set write permission on some files. Now it's been fixed and thus there is little reason to prefer `m clean` (also users are accustomed to `rm -rf out`)

Bug: NA
Test: verified `m clean` works;interestingly soong_metrics file is created at the end
Change-Id: I000d16508613045811fc7792e5798f7c150dcc05
2023-05-23 17:34:15 -04:00
Vinh Tran
c1910c9e07 Merge "Support sandboxing genrule" 2023-05-23 21:29:27 +00:00
Treehugger Robot
8d3df9beeb Merge "Increase R8 max heap size to 4GB" 2023-05-23 21:21:53 +00:00
Vinh Tran
095819530a Sandbox inputs to aidl rule in cc
Bug: 279960133
Test: go test
Test: Remove hdrs prop from IDropBoxManagerService_aidl && run  BUILD_BROKEN_DISABLE_BAZEL=true m libservices && Expect an error from aidl
Change-Id: Ifdb260d8e2da9a5767f1e212393de4134b210616
2023-05-23 15:53:10 -04:00
Chris Parsons
6b49888a17 Remove GetPythonBinary request type
This has been dead code for over a year.

Fixes: 232976601
Test: m nothing
Change-Id: Ida305fc8fa61d8ac83d74ea2cf007073a0019cec
2023-05-23 17:57:38 +00:00
LaMont Jones
9b44c2a725 Run "plugins" singleton in parallel with the rest.
This completes the changes in aosp/q/topic:"parallel-singletons".

(cherry picked from commit 30bf7fe32d)

Bug: 281536768
Test: manual, presubmits
Change-Id: I6529e957fbcca6c18441f823a00061db7556e303
2023-05-23 17:57:00 +00:00
Kun Niu
bd0fd20bdc data_native_bins is only available in java_test_host, add java_test_host properties to java_defaults to make it's available in java_defaults as well.
Test: local build
Bug: 279622634
Change-Id: Iceaf960d587544ae934424a773a6ae3b17fb443e
2023-05-23 17:54:16 +00:00
Jared Duke
3e65f2a53c Increase R8 max heap size to 4GB
The size was increased for D8 in an earlier change, but is more
critical for R8. Match the D8 configuration.

Bug: 241220562,283888124
Test: m
Change-Id: I3b98bf6098f2196c87a97f6c8f7308d9299170d8
2023-05-23 17:32:30 +00:00
Treehugger Robot
b592982bf5 Merge "Revert "Revert "Restrict plugins to an existing allowlist""" am: 1befe407a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2595088

Change-Id: Iff6b543e634c8e6c6b748aa4bf8f5aa6f28caefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 17:13:29 +00:00
Treehugger Robot
1befe407a1 Merge "Revert "Revert "Restrict plugins to an existing allowlist""" 2023-05-23 17:08:46 +00:00
Treehugger Robot
339096c03d Merge "Handle missing dependencies in mixed builds" am: 04a1809d2a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2594894

Change-Id: I3ec3bb68842c1f2ffcddf962c83f038e79058a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 16:53:43 +00:00