Commit graph

62857 commits

Author SHA1 Message Date
Yu Liu
67810eb926 Merge "We now support native code coverage in mixed build." am: acb884e2da am: 526ffcbeea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2366500

Change-Id: Ie5c026cb3ebccd39c8fbc77270d8748c49974122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 20:55:10 +00:00
Yu Liu
526ffcbeea Merge "We now support native code coverage in mixed build." am: acb884e2da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2366500

Change-Id: I1c7247b6cdd0d051d1f25d4e49ca5c4a4a385b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 20:05:26 +00:00
Yu Liu
acb884e2da Merge "We now support native code coverage in mixed build." 2022-12-22 19:31:05 +00:00
Treehugger Robot
2a3432e15a Merge "Swap error before setting to prevent nil error" am: aebab397b3 am: f83163f77f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2366948

Change-Id: Ic2f10a7ed82c33705ec36681227a9592ebb8a670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 09:20:48 +00:00
Treehugger Robot
f83163f77f Merge "Swap error before setting to prevent nil error" am: aebab397b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2366948

Change-Id: Ifcbf86c07c468dd7c924bc70a37d6fbbe2b9ccca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 08:45:03 +00:00
Treehugger Robot
aebab397b3 Merge "Swap error before setting to prevent nil error" 2022-12-22 08:12:06 +00:00
Treehugger Robot
13f7f52484 Merge "Expose avb_hash_algorithm as a property." am: 188dfbb4d6 am: 4e9cc71be8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2363701

Change-Id: Idf2a34cd89238f5b227597057a0d2f9410dc5df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 07:14:01 +00:00
Treehugger Robot
4e9cc71be8 Merge "Expose avb_hash_algorithm as a property." am: 188dfbb4d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2363701

Change-Id: I269f7a70ce24099c3bfd4565ae6e22ba9140280f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 06:38:14 +00:00
Treehugger Robot
188dfbb4d6 Merge "Expose avb_hash_algorithm as a property." 2022-12-22 06:16:47 +00:00
Treehugger Robot
bbe0ed175e Merge changes Ib4fe4def,I6fdecefa am: 9f8599549d am: 29c1d5797d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2361671

Change-Id: If20b5459e4da9cf500608a64a075afbbef113c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 04:59:14 +00:00
Treehugger Robot
29c1d5797d Merge changes Ib4fe4def,I6fdecefa am: 9f8599549d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2361671

Change-Id: I51595d3c0ab6cacb6197671d0fc2441ffaf51ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 04:26:33 +00:00
Treehugger Robot
9f8599549d Merge changes Ib4fe4def,I6fdecefa
* changes:
  Disable sanitizer for vendor_snapshot_object modules
  VSDK: capture hwasan static libs for vsdk snapshot build
2022-12-22 03:52:47 +00:00
Bob Hanji
32169d77d0 [automerger skipped] Merge "Revert "Revert "update MultiAbiTargeting matching logic""" into tm-qpr-dev am: 4a6a53a32c -s ours
am skip reason: Merged-In Ic3b067e98a65146cfa399e7c9b231f397e51c23e with SHA-1 9c94a64e4b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/20235723

Change-Id: I39c68ca3b7bb561ef71cbe88512d26eabdb16fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 00:40:17 +00:00
Artur Satayev
8833dfb166 [automerger skipped] Revert "Revert "update MultiAbiTargeting matching logic"" am: be8bf85b03 -s ours
am skip reason: Merged-In Ic3b067e98a65146cfa399e7c9b231f397e51c23e with SHA-1 9c94a64e4b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/20235723

Change-Id: If502252d51f67d067b3761ef86310f0e94949619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 00:39:20 +00:00
Miguel Aranda
b14300ed7c Merge "Add conscrypt updatable certificates." am: fe12962e13 am: 73126fd7f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2323441

Change-Id: I3f8424c7aff9ac08baff6b2c0f36177ebae2470b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 00:33:15 +00:00
Miguel Aranda
73126fd7f5 Merge "Add conscrypt updatable certificates." am: fe12962e13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2323441

Change-Id: I99889212b1307eeee553780d4d30f929d5b42587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 23:58:16 +00:00
Miguel Aranda
fe12962e13 Merge "Add conscrypt updatable certificates." 2022-12-21 23:20:39 +00:00
Bob Hanji
4a6a53a32c Merge "Revert "Revert "update MultiAbiTargeting matching logic""" into tm-qpr-dev 2022-12-21 23:06:01 +00:00
Yu Liu
482b0ecb80 We now support native code coverage in mixed build.
Bug: 233660582
Test: None
Change-Id: Ied34189293d754256a0f69a8473f77a5d27597ea
2022-12-21 14:31:43 -08:00
Colin Cross
e92a183394 Merge changes I47b8fdd9,Ifbd121ab am: 62e4fe15dc am: d89cb23df2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2360867

Change-Id: I62e25fd1b329baad958ee761650f5e7161f490e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 20:58:39 +00:00
Colin Cross
d89cb23df2 Merge changes I47b8fdd9,Ifbd121ab am: 62e4fe15dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2360867

Change-Id: Ifdd7c58fe1fe91bbf60c0b2e241d3c5b7a6ca725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 20:18:49 +00:00
Liz Kammer
44bc9a3bee Swap error before setting to prevent nil error
Test: go test soong tests
Change-Id: Ib6e3519f0f596b3699882fe682e648dd69ed5645
2022-12-21 15:02:20 -05:00
Colin Cross
62e4fe15dc Merge changes I47b8fdd9,Ifbd121ab
* changes:
  Return linux as host OS from getConfigString when using musl
  Use //build/bazel/platforms/os:linux_glibc for osLinux
2022-12-21 19:33:14 +00:00
Shikha Panwar
e6f3063317 Expose avb_hash_algorithm as a property.
When avb_hash_algorithm is set, for filesystem type build targets,
add_hashtree_footer will be called with the appropriate --hash_algorithm
flag.

Bug: 262892300i
Test: Build succeeds

Change-Id: If2f9c9aa1e98314b3d3e2f8bf25c1bab193f908e
2022-12-21 15:49:15 +00:00
Artur Satayev
be8bf85b03 Revert "Revert "update MultiAbiTargeting matching logic""
This reverts commit 6c5fae512b.

Reason for revert: re-submitting in a topic

Fix: b/246476965
Change-Id: I442e34d035da867ba36462f8e714c4d3c655af2f
Merged-In: Ic3b067e98a65146cfa399e7c9b231f397e51c23e
2022-12-21 10:25:54 +00:00
Vinh Tran
19d2d1e09c Merge "Remove creation of has_stubs in cc_library_shared by bp2build" am: 72e1d65f05 am: 06a7174dc1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2359159

Change-Id: Ia54d6ab010e4442ee09844e74bfd82aae5c6a958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 04:46:42 +00:00
Vinh Tran
06a7174dc1 Merge "Remove creation of has_stubs in cc_library_shared by bp2build" am: 72e1d65f05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2359159

Change-Id: Ie842303e1c838bc178031c619150059bc2047401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-21 04:12:07 +00:00
Vinh Tran
72e1d65f05 Merge "Remove creation of has_stubs in cc_library_shared by bp2build" 2022-12-21 03:16:08 +00:00
Mark Dacek
47a4059db6 Merge "Add bazel metrics proto." am: 003cbe3bc5 am: b6cb07e712
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2363039

Change-Id: I8c1fffbd9a3274a2835939db2396e12c2f8d0a38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 23:48:23 +00:00
Colin Cross
046fcea830 Return linux as host OS from getConfigString when using musl
linux_musl is an alternative host OS, return "linux" from
getConfigString when it is being used.

Bug: 259266326
Test: build/bazel/ci/mixed_libc.sh
Test: USE_HOST_MUSL=true build/bazel/ci/mixed_libc.sh
Change-Id: I47b8fdd93b36345f82dd4e8455edb4c579f805e9
2022-12-20 15:32:18 -08:00
Colin Cross
133782e4bb Use //build/bazel/platforms/os:linux_glibc for osLinux
osLinux is implicitly glibc, use //build/bazel/platforms/os:linux_glibc
for the configurability select key for it.

Bug: 259266326
Test: build/bazel/ci/mixed_libc.sh
Test: USE_HOST_MUSL=true build/bazel/ci/mixed_libc.sh
Change-Id: Ifbd121ab3d943f3fdfbd3f6c3e982d1eaaaa9ec1
2022-12-20 15:29:31 -08:00
Mark Dacek
b6cb07e712 Merge "Add bazel metrics proto." am: 003cbe3bc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2363039

Change-Id: I94c417a1b1494412f9cd0b0202c5e8006e37cc30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 23:12:06 +00:00
Mark Dacek
003cbe3bc5 Merge "Add bazel metrics proto." 2022-12-20 22:38:35 +00:00
Yu Liu
dfb81fd9e7 Merge "Enable code coverage for cc shared library" am: 295cdfc79c am: 8d0f21f4ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2345048

Change-Id: I33f7d499b408960d1ad385392aa0dfd1981fc668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 20:56:21 +00:00
Treehugger Robot
0ae4e4095c Merge "Make more cc tests parallel" am: 463c15de15 am: 0d7bfbec1a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2279412

Change-Id: I77dc8f0c78591915eaf97c6b199b346c507ed595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 20:56:07 +00:00
Yu Liu
8d0f21f4ce Merge "Enable code coverage for cc shared library" am: 295cdfc79c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2345048

Change-Id: I8a4231773d06f8dfceebddc577cb41b9454bd2af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 20:20:36 +00:00
Yu Liu
295cdfc79c Merge "Enable code coverage for cc shared library" 2022-12-20 20:20:12 +00:00
Treehugger Robot
0d7bfbec1a Merge "Make more cc tests parallel" am: 463c15de15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2279412

Change-Id: I3a348c0cbdd0165b61d5a413a58d9b3831a24a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 20:20:04 +00:00
Treehugger Robot
463c15de15 Merge "Make more cc tests parallel" 2022-12-20 19:38:58 +00:00
MarkDacek
2ee2db3bf4 Add bazel metrics proto.
This is to marshal Bazel metrics for the sake of uploading to the
Android metrics pipeline.
Test: m nothing
Test: run the regen script

Change-Id: Ia4eca879cff07425c389e30a385418f9865159d6
2022-12-20 18:34:22 +00:00
Jigar Thakkar
24878d5f2c Merge "Revert "Allow adding extra tradefed options in the Android.bp file"" am: 1d174b185f am: d53055390d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2364219

Change-Id: I2e1d04fe19d6d96c58b91abf4b637978cb0cb160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 17:28:01 +00:00
Jason Wu
ff69b88ad1 Merge "Delete Stale Metrics Files" am: 1c6ca94935 am: 19221c516e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2364221

Change-Id: I3f832458293f961b30285da1e92bbbf2aff767fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 17:27:15 +00:00
Jigar Thakkar
d53055390d Merge "Revert "Allow adding extra tradefed options in the Android.bp file"" am: 1d174b185f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2364219

Change-Id: I465a6d5a5088d34de050325e17e75aa07c24837a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 16:48:09 +00:00
Jason Wu
19221c516e Merge "Delete Stale Metrics Files" am: 1c6ca94935
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2364221

Change-Id: I9e77e2ab0d57a7b07fbcf950f1db092a59ff3e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 16:47:22 +00:00
Jigar Thakkar
1d174b185f Merge "Revert "Allow adding extra tradefed options in the Android.bp file"" 2022-12-20 16:24:20 +00:00
Jason Wu
1c6ca94935 Merge "Delete Stale Metrics Files" 2022-12-20 15:56:21 +00:00
Jingwen Chen
e44855d093 mixed builds: Make apex's GetBazelLabel return the label of the override_apex, if applicable. am: 889f2f2844 am: a9e0538107
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2363859

Change-Id: I1eef3e572af56557c2827260f0a64339bb07b8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 11:46:41 +00:00
Jingwen Chen
a9e0538107 mixed builds: Make apex's GetBazelLabel return the label of the override_apex, if applicable. am: 889f2f2844
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2363859

Change-Id: I05fe6a528087a2b60bac7c500641f41fb078032f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 11:10:52 +00:00
Jingwen Chen
889f2f2844 mixed builds: Make apex's GetBazelLabel return the label of the override_apex, if applicable.
And add test1_com.android.tzdata to prod allowlist.

Fixes: 261054570
Bug: 261054570
Test: mkcompare
Change-Id: I314a4e44ade958ba9a91f71430d76175d734579e
2022-12-20 07:35:20 +00:00
Treehugger Robot
317ebf2dcb Merge "mixed builds: add cc_test bazel handler, and add adbd_test to staging allowlist." am: 597894279d am: f5eaaae7f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2337087

Change-Id: Ic6209a74558401fc2e05c9ba6e8efe70aee2620f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 04:05:26 +00:00