StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,050 Commits 1 Branch 0 Tags
b83c3c55ff55fa8539bc3d0cdfc255d94296da9c
Commit Graph

89050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dennis Shen
b83c3c55ff Merge "aconfig: add c codegen" into main am: afd8b2d75b am: 24ecb48d89 am: f91df0cd73 am: 008d729b86 am: 9c1a675518 
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700

Change-Id: Ie8b5f3c6f999892703530dd09e45e253c595c441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 17:58:18 +00:00
Dennis Shen
9c1a675518 Merge "aconfig: add c codegen" into main am: afd8b2d75b am: 24ecb48d89 am: f91df0cd73 am: 008d729b86 
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700

Change-Id: I648ecefb1a91d8e3c48bab68aaacde7a23fb9330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 17:12:24 +00:00
Dennis Shen
008d729b86 Merge "aconfig: add c codegen" into main am: afd8b2d75b am: 24ecb48d89 am: f91df0cd73 
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700

Change-Id: I973f5fd0d11a97d92fa795b074ff9a922b6065dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 16:05:32 +00:00
Dennis Shen
f91df0cd73 Merge "aconfig: add c codegen" into main am: afd8b2d75b am: 24ecb48d89 
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700

Change-Id: I75ec79309eec955f23b9d1dc9fc9ad72aff19985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 15:21:20 +00:00
Dennis Shen
24ecb48d89 Merge "aconfig: add c codegen" into main am: afd8b2d75b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2653700

Change-Id: Id128c68dfa1b48bcc0a15d85423cd04bc31b42ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 14:35:04 +00:00
Dennis Shen
afd8b2d75b Merge "aconfig: add c codegen" into main 2023-07-13 13:55:10 +00:00
Dennis Shen
7321f4f6f1 aconfig: add c codegen 
c codegen can be done at the same time with cpp codegen, the idea is to
create a c compatible header that defines the flag apis, including flag
override apis for test. then in the corresponding cpp file, the
implementation simply calls into cpp api.

c header supports static method interface, and unit test override, but
it does not support injection pattern compared to cpp header

Bug: b/279483801
Test: atest aconfig.test
Change-Id: Ie62b76d6524e443de5d3c2f9000f7f66623ab571
 2023-07-13 13:55:06 +00:00
Jooyung Han
9f7e7e7e00 Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e am: 18485d30c4 am: 11f325c716 am: 9894a2b449 am: e4a7c0b617 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667

Change-Id: I6c5f948d4cc3f8d0cbd47fd3470d493b4945dc99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 04:17:59 +00:00
Neha Jain
b64d7442e5 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc am: e4098f4648 am: 4efaa94371 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: Id85a3efe6649d80c477499b6f54a29058806ff68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 04:16:11 +00:00
Jooyung Han
e4a7c0b617 Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e am: 18485d30c4 am: 11f325c716 am: 9894a2b449 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667

Change-Id: I4d15f1299d3d860b9d75f2b2ea64943d2c95e4b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 03:35:39 +00:00
Neha Jain
4efaa94371 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc am: e4098f4648 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: If32b2f5c1e8c60871f51d7877624d4da7276d142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 03:33:31 +00:00
Jooyung Han
9894a2b449 Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e am: 18485d30c4 am: 11f325c716 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667

Change-Id: I157fc86cdf370391f84d3bb8f32bc5d4ab95e675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:49:48 +00:00
Neha Jain
e4098f4648 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e am: df039120bc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: I8eb0e4c7cceb3d4d7b2b21ebfea57682ad42b0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:47:36 +00:00
Wei Li
0bbca2ea6e [automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675 am: d9b0ad6622 am: 3ae3a0dc8b -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 fa2d551da5 is already in history

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

Change-Id: I015d3cf24cd2c655e1a9a0948fb42385a19d1c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:06:19 +00:00
Wei Li
ff5c9952a4 [automerger skipped] Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed am: e7dd6b56a8 am: 4e3149b6f2 -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 9b22820150 is already in history

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

Change-Id: I963f45c80621f01e18f233d9c04fa28c569eb6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:06:14 +00:00
Wei Li
452bc2b9e7 [automerger skipped] Include static libraries information in Android SBOM. am: ccf5023a1e am: 7e3e842f07 am: f2e1a18d79 -s ours 
am skip reason: Merged-In Ie2365d79ba24910b7ace132b578589be10a17d78 with SHA-1 ccf5023a1e is already in history

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

Change-Id: I5c07a9f2d37001c74b8b031f8c0e37e1cc98b82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:06:12 +00:00
Jooyung Han
11f325c716 Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e am: 18485d30c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667

Change-Id: I79dc3b44c7d7281697e3b363ec96a0473e11364a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:05:36 +00:00
Neha Jain
df039120bc Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 am: dffb22be1e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: I04922e36d86892a3c22b9fb94151e0e63f777245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:05:04 +00:00
Jooyung Han
18485d30c4 Merge changes I16be0dcb,I4656d43d,I52b831df into main am: b51bc1c77e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646667

Change-Id: I92d6a88a456315fb2f715b6e69c75976450245dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 02:02:52 +00:00
Wei Li
e4ef96d3c3 [automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675 am: d9b0ad6622 -s ours am: 8eba88b57f -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 fa2d551da5 is already in history

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

Change-Id: I119142981c9abf94a6d577c8e05d71bd13044d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:41:32 +00:00
Wei Li
16a8601c68 [automerger skipped] Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed am: e7dd6b56a8 -s ours am: b66fee9f61 -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 9b22820150 is already in history

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

Change-Id: I580506f94aec2fd4cff7e9ca58ec7600d520cf0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:41:29 +00:00
Wei Li
d1d39ef950 [automerger skipped] Include static libraries information in Android SBOM. am: ccf5023a1e am: 7e3e842f07 -s ours am: e2b416afd3 -s ours 
am skip reason: Merged-In Ie2365d79ba24910b7ace132b578589be10a17d78 with SHA-1 ccf5023a1e is already in history

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

Change-Id: I3c33b090f1959f5692cad8a4f4a9a370e523f656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:41:25 +00:00
Wei Li
5b6479f4d1 [automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675 -s ours am: 0b48880ac3 -s ours am: 62afe540be -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3 is already in history

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

Change-Id: Ic06fab87183b6fb4f0e3e46b45f8b1b78ead454e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:40:26 +00:00
Wei Li
ab865d568b [automerger skipped] Revert "Revert "Support SBOM generation of m build unbundled APEXs."" am: fa2d551da5 -s ours am: 32a7243965 -s ours am: 78fe3e3a4a -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3 is already in history

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

Change-Id: I1f1a4dc70d135674e368d0eab008d728a8b38df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:40:20 +00:00
Wei Li
860a95543a [automerger skipped] Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed -s ours am: 4ad74ae60e -s ours am: e43126e96e -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 7c4f064a2b is already in history

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

Change-Id: I7512a0ea76a722c7bbf3f0738408edea32c9d7c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:40:17 +00:00
Wei Li
ae8a584eb1 [automerger skipped] Support SBOM generation of m build unbundled APEXs. am: 9b22820150 -s ours am: 72bfcb85e3 -s ours am: 6b2eea8260 -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 7c4f064a2b is already in history

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

Change-Id: I08d50f9c6819ad219e418766d0e449434cce404c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:40:13 +00:00
Jooyung Han
b51bc1c77e Merge changes I16be0dcb,I4656d43d,I52b831df into main 
* changes:
  Do not install required modules from order-only deps
  Install vintf_fragments/init_rc along with targets
  Install vintf_fragments even when they are shared
 2023-07-13 01:29:47 +00:00
Wei Li
3ae3a0dc8b Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675 am: d9b0ad6622 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24032007

Change-Id: I31b02ea7ded303a3eb7e8d188c487e8051fbab25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:20:36 +00:00
Wei Li
4e3149b6f2 Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed am: e7dd6b56a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029570

Change-Id: I797f92fa4ae5b3d6c241805b1d425f9f7aef78b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:20:32 +00:00
Wei Li
f2e1a18d79 Include static libraries information in Android SBOM. am: ccf5023a1e am: 7e3e842f07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029569

Change-Id: Iea540929014255cfe1b839e74fd71527bcbe1f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:20:27 +00:00
Neha Jain
dffb22be1e Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main am: 3505f2b3a4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655823

Change-Id: I6f426bafe7ad8b1bdc0f30b52ad5126d855f4067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:18:50 +00:00
Wei Li
8eba88b57f [automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675 am: d9b0ad6622 -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 fa2d551da5 is already in history

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

Change-Id: If61ae26fd623418871ccca397c3f564a906c40ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:15:56 +00:00
Wei Li
b66fee9f61 [automerger skipped] Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed am: e7dd6b56a8 -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 9b22820150 is already in history

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

Change-Id: I0dd6ca3df7a1e5841cdaefc4a7527f20c0c62209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:15:54 +00:00
Wei Li
e2b416afd3 [automerger skipped] Include static libraries information in Android SBOM. am: ccf5023a1e am: 7e3e842f07 -s ours 
am skip reason: Merged-In Ie2365d79ba24910b7ace132b578589be10a17d78 with SHA-1 ccf5023a1e is already in history

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

Change-Id: I11db692918a3faef239a8da123397749cf799d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 01:15:49 +00:00
Wei Li
62afe540be [automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675 -s ours am: 0b48880ac3 -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3 is already in history

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

Change-Id: I2799300481eb49d854c47388d17d939bd12f22e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:57:50 +00:00
Wei Li
78fe3e3a4a [automerger skipped] Revert "Revert "Support SBOM generation of m build unbundled APEXs."" am: fa2d551da5 -s ours am: 32a7243965 -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3 is already in history

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

Change-Id: I0835cad601488ade3f8ba0e9630889cc29dcd12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:57:48 +00:00
Wei Li
e43126e96e [automerger skipped] Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed -s ours am: 4ad74ae60e -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 7c4f064a2b is already in history

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

Change-Id: If9b3264e3130f91d359f74aa29666322344bb9ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:57:44 +00:00
Wei Li
6b2eea8260 [automerger skipped] Support SBOM generation of m build unbundled APEXs. am: 9b22820150 -s ours am: 72bfcb85e3 -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 7c4f064a2b is already in history

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

Change-Id: I9be20624fa84022941a679920cfd1693ff465394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:57:41 +00:00
Wei Li
d9b0ad6622 Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24032007

Change-Id: I8d252b65fa6c79b7cd5634a2eb5b50005209e892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:35:58 +00:00
Wei Li
e7dd6b56a8 Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029570

Change-Id: I3e759a281920bd7dce323646de9210201e3d2d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:35:53 +00:00
Wei Li
7e3e842f07 Include static libraries information in Android SBOM. am: ccf5023a1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24029569

Change-Id: I25b0c963047450dd61b22457fc8739b54fe96211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:35:51 +00:00
Wei Li
0b48880ac3 [automerger skipped] Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev am: 56d4b75675 -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3 is already in history

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

Change-Id: Idc388b6218df82db16e81998a414d8d74c965351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:34:02 +00:00
Wei Li
32a7243965 [automerger skipped] Revert "Revert "Support SBOM generation of m build unbundled APEXs."" am: fa2d551da5 -s ours 
am skip reason: Merged-In I965d535771f0bd6eb0e6da66b2c2cc3fd7f194c9 with SHA-1 50745668c3 is already in history

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

Change-Id: I073aa249313f09850a245b2c707f5e163b10a3e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:33:57 +00:00
Wei Li
4ad74ae60e [automerger skipped] Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev am: 3d92e99aed -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 7c4f064a2b is already in history

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

Change-Id: I0db2319cc72909da21ca0751ba98484dc559788c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:33:52 +00:00
Wei Li
72bfcb85e3 [automerger skipped] Support SBOM generation of m build unbundled APEXs. am: 9b22820150 -s ours 
am skip reason: Merged-In I7abadbc083ef66b0e8ace28de69a1a219670ec37 with SHA-1 7c4f064a2b is already in history

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

Change-Id: I1db027f1100dd1e0696da7d500e5416cc21b955b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:33:48 +00:00
Neha Jain
3505f2b3a4 Merge "Revert "Enable CFI for the whole Bluetooth repo and not just system"" into main 2023-07-13 00:24:18 +00:00
Wei Li
56d4b75675 Merge "Revert "Revert "Support SBOM generation of m build unbundled APEXs.""" into udc-dev 2023-07-12 23:41:13 +00:00
Wei Li
3d92e99aed Merge changes from topic "cherrypicker-L97600000961895565:N98400001386758173" into udc-dev 
* changes:
  Support SBOM generation of m build unbundled APEXs.
  Include static libraries information in Android SBOM.
 2023-07-12 23:41:13 +00:00
Colin Cross
0c7be64dca [automerger skipped] Dist kernel_version.txt am: e0d8de9068 am: 1e6d3f7e73 am: 27d1e4934f -s ours 
am skip reason: Merged-In I146817c9cf256f086404c880a0215cb8e688c544 with SHA-1 e0d8de9068 is already in history

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

Change-Id: I33d59fbc4eb395a5f14e5a36f1b943e7ae9becc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:27:41 +00:00
Colin Cross
e2bb0ffd4f [automerger skipped] Dist kernel_version.txt am: e0d8de9068 -s ours am: c442d9f682 -s ours am: 63d855a8cf -s ours 
am skip reason: Merged-In I146817c9cf256f086404c880a0215cb8e688c544 with SHA-1 27f36d1bc8 is already in history

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

Change-Id: I53c693155b020bb05d2b767df51dcd4bd31da360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:26:54 +00:00