Treehugger Robot
12e453bb55
Merge "Remove metalava --no-banner argument" into main
2023-07-12 17:08:42 +00:00
Spandan Das
6b8ac9a33a
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 593b2e5ce4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: I251c7131b61f9885b1bd62099f5558d5da8f2b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 17:08:20 +00:00
Bill Yi
fdcdbed706
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: 7a3ff6b30c
-s ours am: 034689bc97
-s ours
...
am skip reason: Merged-In Ib0eee7237c81e43fe55da0c8569752e956891730 with SHA-1 1e6e7a03ab
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2654585
Change-Id: I91ce5e4e025c79f128d43794ebcf07bf03b74cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:51:56 +00:00
Bill Yi
8aa6265e69
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 49e6f615a6
-s ours am: d7e8603916
-s ours
...
am skip reason: Merged-In Ib0eee7237c81e43fe55da0c8569752e956891730 with SHA-1 1e6e7a03ab
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2654585
Change-Id: I89ba8de134e02c57559b8bb62d391dd22e3b9461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:51:37 +00:00
Bill Yi
034689bc97
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: 7a3ff6b30c
-s ours
...
am skip reason: Merged-In Ib0eee7237c81e43fe55da0c8569752e956891730 with SHA-1 1e6e7a03ab
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2654585
Change-Id: Ida55346f28d26ab18f0b6b1a9c2543c36fcd9d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:10:39 +00:00
Bill Yi
d7e8603916
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 49e6f615a6
-s ours
...
am skip reason: Merged-In Ib0eee7237c81e43fe55da0c8569752e956891730 with SHA-1 1e6e7a03ab
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2654585
Change-Id: Ie210eaf219d515c6d80d4029a72abe5088e932a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 14:10:25 +00:00
Bill Yi
7a3ff6b30c
Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main
2023-07-12 13:38:41 +00:00
Mårten Kongstad
beb2bfded0
Remove metalava --no-banner argument
...
metalava no longer prints an ASCII banner, and has removed its
--no-banner argument. Update all call sites accordingly.
Test: presubmit
Bug: 286023667
Change-Id: I0159cad6571c62d672da5aeb3ff422abb97c7ac9
2023-07-12 14:07:22 +02:00
Roman Kiryanov
fa0f6547b8
Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6
am: f1fc68b180
am: 931b7ca52f
am: 501fce7eef
am: ba806fa9ad
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583
Change-Id: I2bdef312f6c30642e9c412fa94c397937f6dd35d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 06:45:22 +00:00
Roman Kiryanov
ba806fa9ad
Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6
am: f1fc68b180
am: 931b7ca52f
am: 501fce7eef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583
Change-Id: Idcf26dda8dc98da01cfd633604cc88ce9529284d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 06:04:17 +00:00
Roman Kiryanov
501fce7eef
Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6
am: f1fc68b180
am: 931b7ca52f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583
Change-Id: If12221540df5c5e14d78ab296d383616a9908844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 05:19:32 +00:00
Cole Faust
e48489bc45
Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main am: f5350e965b
am: 735fe49732
am: 9aa95a1fb0
am: ef48661524
am: 77f38d7fd6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654584
Change-Id: I5aef613a0a876aef9cb00921a7d50d9190fa605d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 05:19:07 +00:00
Roman Kiryanov
931b7ca52f
Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6
am: f1fc68b180
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583
Change-Id: Ie1ec2c557d63ed1c44dfe56873c186d8d405648b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 04:27:35 +00:00
Cole Faust
77f38d7fd6
Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main am: f5350e965b
am: 735fe49732
am: 9aa95a1fb0
am: ef48661524
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654584
Change-Id: Ie4ffede0025a8b9e75d927d5d74d9e8ee0aa404c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 04:25:25 +00:00
Roman Kiryanov
f1fc68b180
Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main am: 76d1e380a6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654583
Change-Id: Id32c7ef76b06e9bec14cfca3468fccd133a48883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 03:44:38 +00:00
Cole Faust
ef48661524
Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main am: f5350e965b
am: 735fe49732
am: 9aa95a1fb0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654584
Change-Id: Idf53f15a27c874b1a3f628a6213da5f37a15ebbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 03:41:38 +00:00
Cole Faust
9aa95a1fb0
Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main am: f5350e965b
am: 735fe49732
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654584
Change-Id: I2846618a70f12850ced045002b9e19bca1ef1553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 03:02:22 +00:00
Roman Kiryanov
76d1e380a6
Merge "(reland2) Remove emulator dependencies on non emulator targets (2)" into main
2023-07-12 02:51:56 +00:00
Cole Faust
735fe49732
Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main am: f5350e965b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654584
Change-Id: I3f2a8a87108d0949f3e9ab8e6d8beb2ea351270a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 02:18:11 +00:00
Treehugger Robot
d0fab06602
Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5
am: 712109c1f2
am: 9709297328
am: 5cc6f5d6f9
am: 3bfe27cc75
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582
Change-Id: I0c4259dde1349b10350b078031751b035d220341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 01:34:13 +00:00
Cole Faust
f5350e965b
Merge "Remove BOARD_BPT* variables and the bpt parition table image" into main
2023-07-12 01:26:51 +00:00
Treehugger Robot
3bfe27cc75
Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5
am: 712109c1f2
am: 9709297328
am: 5cc6f5d6f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582
Change-Id: I5fbbf6a7a47306b1a35416b7be7116cbcaaf6147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 00:54:02 +00:00
Treehugger Robot
5cc6f5d6f9
Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5
am: 712109c1f2
am: 9709297328
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582
Change-Id: Ic7d95d07dd81326d54acd565e7a0374d54d8e42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-12 00:08:23 +00:00
Cole Faust
4f3dc8759f
Remove BOARD_BPT* variables and the bpt parition table image
...
These variables appear to never be set.
Test: Presubmits
Change-Id: If4b89376f73204ad5780dff421f1216da255c3eb
2023-07-11 16:58:06 -07:00
Treehugger Robot
9709297328
Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5
am: 712109c1f2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582
Change-Id: I237a846298b2f5075856dec16dc1f0c8fea5d676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 23:24:26 +00:00
Treehugger Robot
712109c1f2
Merge "Remove the X attribute from .mk files" into main am: 6bd2bd8ae5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2654582
Change-Id: I15c19c87e9fa6dd4bf13a09bf2fee36579d22115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 22:42:26 +00:00
Tiffany Yang
19450e3a0b
Make common signature system property definitions optional
...
This change allows ARC to define ARC-specific system properties in
Android build without changing these property definitions for other
Android builds. Please see go/arc-sigprop-changes and
go/arc-android-sigprop-sync for additional details.
Bug: 195609932
Test: built bertha_x86_64 with forward declarations
Change-Id: I22bd9d60c2491506fe5c633dbbb9e7516f529b35
2023-07-11 22:40:19 +00:00
Bill Yi
49e6f615a6
Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE
...
Merged-In: Ib0eee7237c81e43fe55da0c8569752e956891730
Merged-In: I1e276e220afe3c0c174a9822b0dce2a923be7b5c
Merged-In: I8c8a4079974ee9e1009483350ab24f790471da9e
Change-Id: I3b31eb8f5c003cb3fc7766e0a8d3378747304943
2023-07-11 15:35:47 -07:00
Wei Li
9b22820150
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
(cherry picked from https://android-review.googlesource.com/q/commit:7c4f064a2bfd17db3129dae64baab510da64eca8 )
Merged-In: I7abadbc083ef66b0e8ace28de69a1a219670ec37
Change-Id: I7abadbc083ef66b0e8ace28de69a1a219670ec37
2023-07-11 22:20:25 +00:00
Wei Li
ccf5023a1e
Include static libraries information in Android SBOM.
...
Bug: 280852724
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m sbom
(cherry picked from https://android-review.googlesource.com/q/commit:d263695cd4dea0f9e4db71691c57ebb63621c09a )
Merged-In: Ie2365d79ba24910b7ace132b578589be10a17d78
Change-Id: Ie2365d79ba24910b7ace132b578589be10a17d78
2023-07-11 22:20:13 +00:00
Treehugger Robot
6bd2bd8ae5
Merge "Remove the X attribute from .mk files" into main
2023-07-11 22:15:06 +00:00
Roman Kiryanov
f945b5df68
(reland2) Remove emulator dependencies on non emulator targets (2)
...
the sidecar issue in GSI was fixed.
Bug: 111538404
Test: presubmit
Change-Id: Ia48ce2e076edc4f13f85e58d9bbbe15b8e6a4438
Signed-off-by: Roman Kiryanov <rkir@google.com >
2023-07-11 14:16:35 -07:00
Roman Kiryanov
3a3b121154
Remove the X attribute from .mk files
...
Bug: 111538404
Test: presubmit
Change-Id: Iefd39e76559ec25c4bdd98893dfc593816da5077
Signed-off-by: Roman Kiryanov <rkir@google.com >
2023-07-11 14:16:35 -07:00
Kelvin Zhang
656a8c98e0
Merge "Mark extracted files as executable" into main am: f3f6d0569b
am: 64f1b4f339
am: 80f171b4dc
am: 73825c069b
am: 151d8d737d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650068
Change-Id: Id339ec300ced5d014f930bf8763d2f0f2b1c6fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 21:12:10 +00:00
Kelvin Zhang
151d8d737d
Merge "Mark extracted files as executable" into main am: f3f6d0569b
am: 64f1b4f339
am: 80f171b4dc
am: 73825c069b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650068
Change-Id: I3943a4caf18f727485e1c1f4364bcd5c3e48e502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:26:13 +00:00
Colin Cross
44bf50769f
Merge "Dist kernel_version.txt" into main am: b177e347aa
am: 7ea1cb5152
am: 107d88e6ab
am: 85270110d8
am: 8857b93ea6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652360
Change-Id: Ib481e6e8827398784905a034bac5889f0ad05497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:03:55 +00:00
Elliott Hughes
0fb9e3f926
Merge "Switch from minigzip to gzip." into main am: c1577ff58b
am: f94ff9146d
am: d9cdcba928
am: 7a75419a51
am: 30376cd64f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009
Change-Id: I41c1e36baf0d01ee6d0d9a768ce2a06c361427a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 20:02:17 +00:00
Austin Borger
6c1f632cef
[automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64
-s ours am: 1e452882b5
-s ours am: 841038efc6
-s ours am: bd9377e559
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: I6179a59bd9c214e5788b0b60a029c395b7ea6b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:40:00 +00:00
Kelvin Zhang
73825c069b
Merge "Mark extracted files as executable" into main am: f3f6d0569b
am: 64f1b4f339
am: 80f171b4dc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650068
Change-Id: I28d7ffb55385a5c5b5a87b6311c3b9a77a70d320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:39:42 +00:00
Spandan Das
9baec46038
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008
-s ours am: 2fc41d1ca5
-s ours am: 5f64847c53
-s ours am: 0a22b48943
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: I3cd84a2b198488e71f53b47502999558906888be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:39:13 +00:00
Colin Cross
8857b93ea6
Merge "Dist kernel_version.txt" into main am: b177e347aa
am: 7ea1cb5152
am: 107d88e6ab
am: 85270110d8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652360
Change-Id: Ife30b9314691e91de086704b34a955de573dde69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:20:13 +00:00
Elliott Hughes
30376cd64f
Merge "Switch from minigzip to gzip." into main am: c1577ff58b
am: f94ff9146d
am: d9cdcba928
am: 7a75419a51
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009
Change-Id: If84eac2f8be16c951069c8318dad099306350f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:18:51 +00:00
Kelvin Zhang
80f171b4dc
Merge "Mark extracted files as executable" into main am: f3f6d0569b
am: 64f1b4f339
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650068
Change-Id: I29e4be4de523de34c1aa71c07d3aa1be380a3449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 19:00:22 +00:00
Austin Borger
bd9377e559
[automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64
-s ours am: 1e452882b5
-s ours am: 841038efc6
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: I411082f4e5226cd47e73aee14a58150ae5fe0c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:56:07 +00:00
Spandan Das
0a22b48943
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008
-s ours am: 2fc41d1ca5
-s ours am: 5f64847c53
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: I2c19828a9f10189261b044fbf1b21c4872b5b99d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:55:17 +00:00
Colin Cross
85270110d8
Merge "Dist kernel_version.txt" into main am: b177e347aa
am: 7ea1cb5152
am: 107d88e6ab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2652360
Change-Id: Ic1f8f33fdda0ba6634b93fe6451d08cbc6c713bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:26:06 +00:00
Elliott Hughes
7a75419a51
Merge "Switch from minigzip to gzip." into main am: c1577ff58b
am: f94ff9146d
am: d9cdcba928
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2632009
Change-Id: I9e0fe8aff864b5423a0a9c066838e76c1cea98a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:25:43 +00:00
Austin Borger
841038efc6
[automerger skipped] Merge "Create default PRODUCT_INCLUDE_TAGS in product_config" into tm-qpr-dev am: 8a0ae28e64
-s ours am: 1e452882b5
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: Ic26df91d800f245f37f2e3b268c3a0c9eaa5a73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:21:41 +00:00
Spandan Das
5f64847c53
[automerger skipped] Create default PRODUCT_INCLUDE_TAGS in product_config am: aa9f41a008
-s ours am: 2fc41d1ca5
-s ours
...
am skip reason: Merged-In I322b52c34ed339989207609dd0fd23c27ed1f697 with SHA-1 2e69ea6228
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23609718
Change-Id: Iaf05efcf93db90a73e34e9838d7b02d59c058ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:20:56 +00:00
Kelvin Zhang
64f1b4f339
Merge "Mark extracted files as executable" into main am: f3f6d0569b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2650068
Change-Id: Iefc9c727afa46a8670cbe865d52597695bb0c344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-11 18:16:24 +00:00