Treehugger Robot
cdbf7a19ae
Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec
am: 0049761888
am: fa2e92ad5f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192
Change-Id: Ib2e7572d27f5c3227d039e50980b867e554bc47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 10:28:25 +00:00
Treehugger Robot
9661e4661d
[automerger skipped] Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c
am: 0a7b4ebd66
am: 12d0045266
-s ours
...
am skip reason: Merged-In I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5 with SHA-1 d4639705bd
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2826010
Change-Id: Idff27cecb1dd653a909124a72770c53c7eda6cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 10:28:06 +00:00
Treehugger Robot
fa2e92ad5f
Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec
am: 0049761888
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192
Change-Id: I0bc80d655096209521110d21f3efcf375f4a7854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:55:43 +00:00
Treehugger Robot
12d0045266
Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c
am: 0a7b4ebd66
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2826010
Change-Id: Ieadf4caa198f5189f08374130ab5ac28adb2c166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:55:30 +00:00
Treehugger Robot
0049761888
Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192
Change-Id: Ibd220ff1a38643d437a363c3a930c02eade12f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:08:59 +00:00
Treehugger Robot
0a7b4ebd66
Merge "GSI: add VNDK 34/remove VNDK 29" into main am: 4e7ba9e30c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2826010
Change-Id: Ic4d8d9a155f34b5b8c05c61b60e9b74e05646fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:08:45 +00:00
Treehugger Robot
1f9ba9c4ec
Merge "Don't build VNDK on GSI" into main
2023-11-10 09:04:16 +00:00
Colin Cross
0c8f1c869a
Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
am: d7f59ea0c9
am: 6b6f1bd694
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118
Change-Id: I3687877a57d0fb8e6707dc17df08b77d194bb519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 08:35:41 +00:00
Colin Cross
dde924d793
Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
am: d8be2bfeef
am: 3f818b17e0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118
Change-Id: I3b9d3f7d6963ab158216887f2d04c89ba12e1f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 08:34:17 +00:00
Treehugger Robot
4e7ba9e30c
Merge "GSI: add VNDK 34/remove VNDK 29" into main
2023-11-10 08:31:14 +00:00
Hung-ying Tyan
d116600dc1
Don't build VNDK on GSI
...
Bug: 308878144
Test: manual mix on T Pixel 6
Change-Id: I924d9a52f542450bdfc727d65e668e56bb89bc50
2023-11-10 08:01:59 +00:00
Hung-ying Tyan
04531b5c79
GSI: add VNDK 34/remove VNDK 29
...
Bug: 291204040
Test: boot GSI on U Pixel
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4639705bdf86c8b8c1607719eab4f5791e236fe )
Merged-In: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
Change-Id: I04c50ca03a6ebd9b371a35f66faf5ea7861c6ca5
2023-11-10 08:00:56 +00:00
Colin Cross
6b6f1bd694
Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
am: d7f59ea0c9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118
Change-Id: Iad94a8cf591f412c680041fab5ce107f4eeb5924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:46:54 +00:00
Colin Cross
3f818b17e0
Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
am: d8be2bfeef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118
Change-Id: I8b82a223b41e2f37add238edcc51a7fd8ae28807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:44:46 +00:00
Colin Cross
d7f59ea0c9
Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118
Change-Id: Iebaf6e894b8131cc7ef9f5ba091b3e974f5407de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:13:56 +00:00
Colin Cross
d8be2bfeef
Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main am: 481b02106c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816118
Change-Id: I91ee4c153dd76c4d66ba3e14eb769610233cf129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 07:13:51 +00:00
Colin Cross
481b02106c
Merge "Skip parts of notice_files.mk that don't apply to Soong modules" into main
2023-11-10 06:15:45 +00:00
Treehugger Robot
2fd4b06651
Merge "Prevent using symlinks to starlark files" into main am: 124101862b
am: 3e1b4de768
am: 09b2fe67c8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818
Change-Id: I6e66b6aa8689ba337eb58e18b21474ca15f6ef70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 02:10:02 +00:00
Treehugger Robot
3f4786e890
Merge "Prevent using symlinks to starlark files" into main am: 124101862b
am: 5ddf4a3006
am: f027dee3fc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818
Change-Id: I664272f2669b0902b4e47c1d83ff655618b2ff72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 02:08:43 +00:00
Treehugger Robot
09b2fe67c8
Merge "Prevent using symlinks to starlark files" into main am: 124101862b
am: 3e1b4de768
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818
Change-Id: I273ba5d9b9235a6af193df0c4fc82b0717f389fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 01:22:04 +00:00
Treehugger Robot
f027dee3fc
Merge "Prevent using symlinks to starlark files" into main am: 124101862b
am: 5ddf4a3006
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818
Change-Id: I2a51939771f153a16440bb78630b1ff16d279334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 01:19:33 +00:00
Treehugger Robot
3e1b4de768
Merge "Prevent using symlinks to starlark files" into main am: 124101862b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818
Change-Id: Ie2d70f0cacaa31475256d5d6471fd74edb548097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 00:48:50 +00:00
Juan Yescas
92c19fabf9
Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492
am: f476e19d72
am: 01cd459cc9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861
Change-Id: I5c6716fa152483ee9431d8c1b669236eed37f860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 00:47:56 +00:00
Juan Yescas
1ed28d0a07
Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492
am: 1b51f6ec38
am: 3675aaf529
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861
Change-Id: I50ddf4ac601625bf71cb7df4b1f0fd20f78c965f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 00:47:13 +00:00
Treehugger Robot
5ddf4a3006
Merge "Prevent using symlinks to starlark files" into main am: 124101862b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818
Change-Id: Ie8b9274d39ceba0892e90b788afa00b8ab3066e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 00:45:45 +00:00
Juan Yescas
01cd459cc9
Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492
am: f476e19d72
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861
Change-Id: I49d2e1c416242bb18195427f375c3a7416c148dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 00:02:28 +00:00
Treehugger Robot
124101862b
Merge "Prevent using symlinks to starlark files" into main
2023-11-10 00:00:41 +00:00
Juan Yescas
3675aaf529
Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492
am: 1b51f6ec38
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861
Change-Id: I2925660bae1ab5568048fea13c2511c3b8078e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 23:59:59 +00:00
Juan Yescas
f476e19d72
Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861
Change-Id: Ib4b97c0989ca1a4a8340549f988d56ad720c32a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 23:27:57 +00:00
Treehugger Robot
ea65de7fe3
Merge "Remove _kwmarker" into main am: c50601abc4
am: 62b0a71882
am: a4d489f1e8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864
Change-Id: I1926ef0d42e5fc2893b1d48abafa373cec8879eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 23:27:24 +00:00
Treehugger Robot
20114d077f
Merge "Remove _kwmarker" into main am: c50601abc4
am: 1d1abfeded
am: 222a155d27
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864
Change-Id: I6a5228cc803777aebb95b16ff5bf8b042c55bedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 23:26:14 +00:00
Juan Yescas
1b51f6ec38
Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main am: 06b7b6c492
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824861
Change-Id: Iaaa88ab3fa7c6302008b04c5400dbdf099697ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 23:25:59 +00:00
Juan Yescas
06b7b6c492
Merge "16k: Support max-page-size alignment greater than 4096 for x86-64" into main
2023-11-09 23:07:09 +00:00
Treehugger Robot
a4d489f1e8
Merge "Remove _kwmarker" into main am: c50601abc4
am: 62b0a71882
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864
Change-Id: I2ce86edf7ea979fe50c72bec10625379ba227afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 22:42:23 +00:00
Treehugger Robot
222a155d27
Merge "Remove _kwmarker" into main am: c50601abc4
am: 1d1abfeded
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864
Change-Id: Ia46dbc36f8606ffa7ed727e7b15faf6f3ac85086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 22:38:54 +00:00
Cole Faust
ccd26808af
Prevent using symlinks to starlark files
...
Symlinks are frequently confusing / a source of bugs. They also don't
provide much utility over just loading the other file and re-exporting
its symbols, so recommend doing that instead.
Test: Presubmits
Change-Id: Ie3052ebc0add77f1746d6321fbdf7bc15df9819b
2023-11-09 14:32:55 -08:00
Treehugger Robot
62b0a71882
Merge "Remove _kwmarker" into main am: c50601abc4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864
Change-Id: Id2eb08dcc0bab817294353485302526a52b146dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 22:08:37 +00:00
Treehugger Robot
1d1abfeded
Merge "Remove _kwmarker" into main am: c50601abc4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824864
Change-Id: I668458272c7a0bc5a522c273fce9050824d1730e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 22:05:10 +00:00
Treehugger Robot
7758fa78b9
Merge "Finalization for Trunk Stable, REL." into main
2023-11-09 22:04:48 +00:00
Dennis Shen
af139f9070
Merge changes from topic "rust_caching" into main am: 05585a9fa3
am: 5238c1564e
am: a1b86b1a7b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822932
Change-Id: I0f34e26895c3b54e22ed8df9468ff15b4bfe9bb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 21:36:47 +00:00
Dennis Shen
cca809ea9c
aconfig: Cache flag values for c/c++ codegen am: 96506f4349
am: 72d310b4db
am: f154ea19f1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822931
Change-Id: I87621012c9b16578ed22575f02dd2ae49186b134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 21:36:43 +00:00
Treehugger Robot
c50601abc4
Merge "Remove _kwmarker" into main
2023-11-09 21:35:20 +00:00
Dennis Shen
1fddfa7803
Merge changes from topic "rust_caching" into main am: 05585a9fa3
am: e9ca2c03bf
am: 56800bfb5f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822932
Change-Id: Ifab99c9f23fb6cf92cb0a7a1eb24bf637130abef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 21:32:44 +00:00
Dennis Shen
a1b86b1a7b
Merge changes from topic "rust_caching" into main am: 05585a9fa3
am: 5238c1564e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822932
Change-Id: I19ce60a910716f28cd8f3891e2ef8857ece62ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 21:24:21 +00:00
Dennis Shen
f154ea19f1
aconfig: Cache flag values for c/c++ codegen am: 96506f4349
am: 72d310b4db
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822931
Change-Id: I0f18736ad3d460f48d2c5070aeac3f0f7a7b8266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 21:24:15 +00:00
Dennis Shen
56800bfb5f
Merge changes from topic "rust_caching" into main am: 05585a9fa3
am: e9ca2c03bf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822932
Change-Id: I4f8736e820abd9231bf97dd48608bae9e2a1498d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 21:20:12 +00:00
Juan Yescas
ebadc969a8
16k: Support max-page-size alignment greater than 4096 for x86-64
...
To simulate 16k page size in x86-64 cuttefish, it is necessary
to compile the shared libraries and binaries with max-page-size greater
than 4096.
Bug: 309816695
Test: source build/envsetup.sh
lunch aosp_cf_x86_64_phone_pgagnostic-trunk-userdebug
m
Change-Id: Id8e142a5a3556f5fd30ce90eaac236dcbc1b0881
2023-11-09 12:51:30 -08:00
Dennis Shen
5238c1564e
Merge changes from topic "rust_caching" into main am: 05585a9fa3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822932
Change-Id: If280764951df0194be06e78e346fb526fbce32b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 20:49:45 +00:00
Dennis Shen
72d310b4db
aconfig: Cache flag values for c/c++ codegen am: 96506f4349
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822931
Change-Id: If14f9e876aee26b12a2cd9f27b0a3e993e552a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 20:49:40 +00:00
Dennis Shen
e9ca2c03bf
Merge changes from topic "rust_caching" into main am: 05585a9fa3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822932
Change-Id: Ibf951e107a314b5aa386fdc41a52c754c3b7f964
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 20:46:35 +00:00