Florian Mayer
e8cb3c5e85
[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
am: 824884e4a5
am: ea84ed07ea
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 0f79319bb8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: I413d362d8b9f2d837d0fc59b9860b132560780be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:58:05 +00:00
Florian Mayer
c852882cae
[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
-s ours am: bfec611d38
-s ours am: 49293d30cc
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: I4c90e1b4feab5c1462bd4691fd138a164460e366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:53:38 +00:00
Florian Mayer
b8797dc813
[automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am: 0f79319bb8
-s ours am: 78fcb463be
-s ours am: 1c3d7c4c1a
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: I38b65618c4b81eb542bd350e8e3ac0b6c83f9830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:53:36 +00:00
Florian Mayer
486d467b64
[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
am: 824884e4a5
-s ours am: 7548f1b7e9
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: I1dcf6ccab74c87788d5d53b0ca56d8ff6ff2298e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:52:30 +00:00
Mårten Kongstad
2302e3c4be
Merge "aconfig: make proto fields optional" am: a3b0027fdb
am: 0201a71f0c
am: a34196902b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237
Change-Id: I6c0d6c0195b41a71c5f8cb9701784e55ae2ef9f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:34:06 +00:00
Florian Mayer
ea84ed07ea
Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
am: 824884e4a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: I2aa748525175648c54519c50af647ff4499bfd36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:09:32 +00:00
Florian Mayer
49293d30cc
[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
-s ours am: bfec611d38
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: Ifeae862bcd20a51b80e19155e2b2f158eefd3956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:09:22 +00:00
Florian Mayer
1c3d7c4c1a
[automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am: 0f79319bb8
-s ours am: 78fcb463be
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: I4bf0f722cb6cdbc448d367d0d78b204e3d9ff709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:09:20 +00:00
Florian Mayer
7548f1b7e9
[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
am: 824884e4a5
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: Icdd01e09e2ca5595ff7b60a853f6f656d18db654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 21:06:58 +00:00
Zhi Dou
ee205db6ea
Merge "aconfig: generate Java flag name constants" am: cff292f8b2
am: 1f7e9252ed
am: 6b29eed1a1
am: 5ace4a9cc3
am: 44fa277858
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170
Change-Id: I00e61a7b147d92eddfaad876e4710d7fe5da5e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 20:47:33 +00:00
Mårten Kongstad
a34196902b
Merge "aconfig: make proto fields optional" am: a3b0027fdb
am: 0201a71f0c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237
Change-Id: I59b511d99376a364cca6dc74e9c1fb1a97995943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 20:47:13 +00:00
Florian Mayer
bfec611d38
[automerger skipped] Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: I59268504ab66e848bdeb2fbad756ffee8d30ef2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 20:24:10 +00:00
Florian Mayer
78fcb463be
[automerger skipped] Fix bug when memtag_heap in diag but not sanitizers am: 0f79319bb8
-s ours
...
am skip reason: Merged-In Iaeb23d0f4962bb3d788036fadc14b9420221a38e with SHA-1 2a67626055
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: Iacc04080273db202a25cebab1ae2cab7c3c75c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 20:24:08 +00:00
Florian Mayer
824884e4a5
Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev am: ffd1290cc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23678238
Change-Id: Ia6acfda4027a88c593f0bb6f903a94ad2948f2d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 20:23:41 +00:00
Mårten Kongstad
0201a71f0c
Merge "aconfig: make proto fields optional" am: a3b0027fdb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2627237
Change-Id: I697af95c091cf919fe0f094c03d83f99834d4ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 20:05:02 +00:00
Zhi Dou
44fa277858
Merge "aconfig: generate Java flag name constants" am: cff292f8b2
am: 1f7e9252ed
am: 6b29eed1a1
am: 5ace4a9cc3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170
Change-Id: Idab1fad7024baffcbefbd37597e2f4697de35d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 20:01:16 +00:00
Florian Mayer
ffd1290cc9
Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev
2023-06-20 19:50:47 +00:00
Zhi Dou
5ace4a9cc3
Merge "aconfig: generate Java flag name constants" am: cff292f8b2
am: 1f7e9252ed
am: 6b29eed1a1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170
Change-Id: I72c9c984f1e5f7380e027c6e6ada23c333a296a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 18:58:44 +00:00
Treehugger Robot
4bbbbf6a1c
Merge "aconfig: use proto struct directly" am: 23788f85a4
am: 7639e644a3
am: 6a5ce4a2a9
am: 0531aac817
am: 19963ac819
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052
Change-Id: I26165b2a728699c3ce59be1a9f57a0e3f0397b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 18:54:44 +00:00
Mårten Kongstad
a3b0027fdb
Merge "aconfig: make proto fields optional"
2023-06-20 18:47:08 +00:00
Wei Li
7c4f064a2b
Support SBOM generation of m build unbundled APEXs.
...
Bug: 266726655
Test: banchan com.android.adbd arm64 userdebug && m dist
Test: build/soong/tests/sbom_test.sh
Change-Id: I7abadbc083ef66b0e8ace28de69a1a219670ec37
2023-06-20 11:23:56 -07:00
Zhi Dou
6b29eed1a1
Merge "aconfig: generate Java flag name constants" am: cff292f8b2
am: 1f7e9252ed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170
Change-Id: Ib3c13cc9bb688aba2d458dd928b92dc77ce369a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 18:13:31 +00:00
Treehugger Robot
19963ac819
Merge "aconfig: use proto struct directly" am: 23788f85a4
am: 7639e644a3
am: 6a5ce4a2a9
am: 0531aac817
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052
Change-Id: I049d2c378b312a54f57a2dc5f9cd29028a05bb7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 18:12:37 +00:00
Zhi Dou
1f7e9252ed
Merge "aconfig: generate Java flag name constants" am: cff292f8b2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2611170
Change-Id: I21da79301c4dc8828c6b4b48923720121dc91342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:32:16 +00:00
Jiakai Zhang
7dbe6335af
Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518
am: 9778268c87
am: aaa9e6ac0a
am: 2721abe7d4
am: 3737a946a3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038
Change-Id: Id358d550fc7dcf7d109ec10862d87250a367597f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:29:19 +00:00
Treehugger Robot
0531aac817
Merge "aconfig: use proto struct directly" am: 23788f85a4
am: 7639e644a3
am: 6a5ce4a2a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052
Change-Id: I92b8b44af3956702740f508119c491222fff659c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 17:28:39 +00:00
Zhi Dou
cff292f8b2
Merge "aconfig: generate Java flag name constants"
2023-06-20 16:53:53 +00:00
Jiakai Zhang
3737a946a3
Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518
am: 9778268c87
am: aaa9e6ac0a
am: 2721abe7d4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038
Change-Id: Ifde9f89efc3c490ba8097ec42a4881c3a904c410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 16:46:22 +00:00
Treehugger Robot
6a5ce4a2a9
Merge "aconfig: use proto struct directly" am: 23788f85a4
am: 7639e644a3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052
Change-Id: Ia06be6b396a9f28f4a672d5767d65198c70f67c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 16:41:44 +00:00
Treehugger Robot
7639e644a3
Merge "aconfig: use proto struct directly" am: 23788f85a4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052
Change-Id: Ie7a63ce89d02bc3fc4fcee4e3080cc86779a167f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 16:04:25 +00:00
Jiakai Zhang
2721abe7d4
Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518
am: 9778268c87
am: aaa9e6ac0a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038
Change-Id: Ia060a7e6d0e8b3008e8345f5f6b9234661e98816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 16:03:11 +00:00
Treehugger Robot
23788f85a4
Merge "aconfig: use proto struct directly"
2023-06-20 15:28:58 +00:00
Jiakai Zhang
aaa9e6ac0a
Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518
am: 9778268c87
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038
Change-Id: I42dc72722af03f968b96f680ac8670077f9e8d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 15:16:08 +00:00
Jiakai Zhang
9778268c87
Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038
Change-Id: I02e2fae8e1707fbb11b76bfad7c364527b855bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 14:38:23 +00:00
Jiakai Zhang
bedc1d3518
Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC."
2023-06-20 13:52:04 +00:00
Jooyung Han
8cc42f429f
Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
...
We will deprecate flattened apexes. In this change, GSI-specific make
variable (PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES) is removed. The
variable was used to install both image/flattened apexes in the GSI, so
that it works on ro.apex.updatable devices and not-updatable devices.
Now, GSI will have only image APEXes in it.
Bug: 278826656
Test: lunch gsi_arm64-userdebug && m # no flattened apexes
Change-Id: I4702973d4ee75aa693e4e7f4e57577b77059dc09
2023-06-20 14:27:10 +09:00
Wei Li
5274bcbcdc
Merge "Include static libraries information in Android SBOM." am: c20175155a
am: 7f298d8a1a
am: 98a187fb69
am: 83cdd1f97d
am: 55734abd80
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475
Change-Id: Ifa2359e487edb3f986d543d593756fb1226b2dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 01:42:07 +00:00
Wei Li
55734abd80
Merge "Include static libraries information in Android SBOM." am: c20175155a
am: 7f298d8a1a
am: 98a187fb69
am: 83cdd1f97d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475
Change-Id: I9ec9c1f657749b312b881da15d27c37b5f8f7946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 01:02:49 +00:00
Wei Li
83cdd1f97d
Merge "Include static libraries information in Android SBOM." am: c20175155a
am: 7f298d8a1a
am: 98a187fb69
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475
Change-Id: I16510d59533dc69cbeeeddaefaba91e691631949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-20 00:19:01 +00:00
Wei Li
98a187fb69
Merge "Include static libraries information in Android SBOM." am: c20175155a
am: 7f298d8a1a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475
Change-Id: Ic7b8cc18a72785db9b8401ff9f29295512d4a05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 23:31:21 +00:00
Wei Li
7f298d8a1a
Merge "Include static libraries information in Android SBOM." am: c20175155a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475
Change-Id: I342757931802a04dd09d0f50e3eea2219fdd5948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 22:51:32 +00:00
Treehugger Robot
4cde8fd597
Merge "Fix usage message." am: fb8c86513e
am: 9d9e540cc5
am: 8b1c423839
am: 26fb87e0fd
am: dc7284146a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356
Change-Id: I48a02b9a69176a050aa30dc36327cbe3b8fc19f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 22:46:15 +00:00
Treehugger Robot
bdd5fb29df
Merge "Fix godoc typos." am: d999938ab0
am: 6df5275646
am: b89f8537cc
am: 0a12cee3aa
am: 1ac1544628
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628611
Change-Id: Idcdbb24e233efbcc383a3411c98baadcd2428980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 22:45:58 +00:00
Treehugger Robot
dc7284146a
Merge "Fix usage message." am: fb8c86513e
am: 9d9e540cc5
am: 8b1c423839
am: 26fb87e0fd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356
Change-Id: I9dd4de1d53e30b4f5417cb8bc07911c881009a06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 22:04:42 +00:00
Treehugger Robot
1ac1544628
Merge "Fix godoc typos." am: d999938ab0
am: 6df5275646
am: b89f8537cc
am: 0a12cee3aa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628611
Change-Id: Ie4d9a20f5ccf30c56fe09555e0d6da0b6f5db240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 22:04:28 +00:00
Wei Li
c20175155a
Merge "Include static libraries information in Android SBOM."
2023-06-19 22:02:20 +00:00
Treehugger Robot
26fb87e0fd
Merge "Fix usage message." am: fb8c86513e
am: 9d9e540cc5
am: 8b1c423839
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356
Change-Id: I807ef4d81821548df70ead6fc3db2bde6ce3d75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 21:19:17 +00:00
Treehugger Robot
0a12cee3aa
Merge "Fix godoc typos." am: d999938ab0
am: 6df5275646
am: b89f8537cc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628611
Change-Id: I656792d1b06e40d378b4cbccf39cc1550cf646d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 21:19:03 +00:00
Treehugger Robot
8b1c423839
Merge "Fix usage message." am: fb8c86513e
am: 9d9e540cc5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356
Change-Id: I3d87e175e24967da9ee5980341f927a9985a7c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 20:31:41 +00:00
Treehugger Robot
b89f8537cc
Merge "Fix godoc typos." am: d999938ab0
am: 6df5275646
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2628611
Change-Id: Ib220fc15a0083bfdd821d92ff920eaf84be5b768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-19 20:31:30 +00:00