StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,226 Commits 1 Branch 0 Tags
2a19321e3d86f23f35bf67c22885c64dae7b51d8
Commit Graph

36880 Commits

Author SHA1 Message Date
Jeff Hamilton
7e2a56d9eb Move most version variable out to relase configs. 
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
 2023-10-24 17:41:05 +00:00
Wei Li
335a21390a Merge "Initial implementation of layoutlib SBOM generation." into main am: 420d7d5878 am: 66b9807e09 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795634

Change-Id: I6a51a76b62e677e9b33b82fb7dea2f68048d3a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 17:37:36 +00:00
Wei Li
54907c00ec Merge "Initial implementation of layoutlib SBOM generation." into main am: 420d7d5878 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795634

Change-Id: I866aef933b469fddc2302ac465d4a03535537c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 17:37:06 +00:00
Jeff Hamilton
2666d4443b Move most version variable out to relase configs. 
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
 2023-10-24 17:28:07 +00:00
Wei Li
66b9807e09 Merge "Initial implementation of layoutlib SBOM generation." into main am: 420d7d5878 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795634

Change-Id: I14d489b9b65e5b29d7df5cd60aac7b96c75337a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 17:11:53 +00:00
Wei Li
420d7d5878 Merge "Initial implementation of layoutlib SBOM generation." into main 2023-10-24 17:11:20 +00:00
Jeff Hamilton
426a9f8f02 Move most version variable out to relase configs. 
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
 2023-10-24 16:41:58 +00:00
Baligh Uddin
186888303d Revert^2 "Move most version variable out to relase configs." 
69b38b52b6

Change-Id: I67c9ac7869fcad54f3b0b93a04e9dda5f97861d6
Bug: 306702353
Test: TH and local
 2023-10-24 14:19:52 +00:00
Orhan Uysal
8e530a00d9 Merge "Revert "Move most version variable out to relase configs."" into main 2023-10-24 09:30:08 +00:00
Orhan Uysal
69b38b52b6 Revert "Move most version variable out to relase configs." 
Revert submission 25118098-ap11

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_aosp-main-future&target=errorprone-trunk_staging&lkgb=10993884&lkbb=10995208&fkbb=10994141, bug b/307480895

Reverted changes: /q/submissionid:25118098-ap11

Change-Id: I2bc1fc4a9e92a3c4cf8acba3dbaaf61e6fb0774e
 2023-10-24 09:03:24 +00:00
Jeff Hamilton
288b4a180d Merge "Move most version variable out to relase configs." into main 2023-10-24 02:57:48 +00:00
Jeff Hamilton
c40f31641b Move most version variable out to relase configs. 
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
 2023-10-23 21:54:57 +00:00
tyiu
ec689ff2eb Add config for FULL_SYSTEM_OPTIMIZE_JAVA 
FULL_SYSTEM_OPTIMIZE_JAVA allows device to enable full system java
optimization.

Bug: 300514883
Test: local m
Ignore-AOSP-First: Changes for wear and other form-factors
Change-Id: Iba0a546ef2b721b929b791c6a9e6c854e9bec909
 2023-10-23 20:50:10 +00:00
Treehugger Robot
551ce8f8c2 Merge "sysprop: Remove commits to void build break" into main am: 130bf250d2 am: 8298f83398 am: c9db9ffa2d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794413

Change-Id: Iee98b03639a2fa1726674441455dc97d35e89a83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 20:44:58 +00:00
Treehugger Robot
c9db9ffa2d Merge "sysprop: Remove commits to void build break" into main am: 130bf250d2 am: 8298f83398 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794413

Change-Id: I662c3c0e02da26cdb91c7ed070949d7dfd472539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 20:17:21 +00:00
Treehugger Robot
6d097c7d90 Merge "sysprop: Remove commits to void build break" into main am: 130bf250d2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794413

Change-Id: Ic9315e9afd30e3b88bf2685bb2adc13946683ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 19:57:37 +00:00
Treehugger Robot
8298f83398 Merge "sysprop: Remove commits to void build break" into main am: 130bf250d2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794413

Change-Id: Ie882013a49ee4496041e9f2a47cf854f6e014281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-23 19:56:18 +00:00
Master
08f6715f37 sysprop: Remove commits to void build break 
Reason: while building it cause echo to break, and hence props are not set
Change-Id: I7bed0e01cc71cbe37888f9d407569f8e1477d0f2
 2023-10-21 04:20:14 +00:00
Treehugger Robot
dd1c16eb59 Merge "Add special paths for BoardConfig.mk for gf and cf" into main am: 9bfce20efd am: b1791e0b6d am: 484dc1917d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795597

Change-Id: I91c7bce886c2b13c7048232017e6dd4c6f3f182d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 21:41:55 +00:00
Treehugger Robot
484dc1917d Merge "Add special paths for BoardConfig.mk for gf and cf" into main am: 9bfce20efd am: b1791e0b6d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795597

Change-Id: I65adf0a114e0be4adc3c0bd13bbfe912487e2f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 21:17:25 +00:00
Treehugger Robot
f538091dba Merge "Add special paths for BoardConfig.mk for gf and cf" into main am: 9bfce20efd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795597

Change-Id: I7c21db126682608867a9132f92ad548ec83987fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 21:02:05 +00:00
Treehugger Robot
b1791e0b6d Merge "Add special paths for BoardConfig.mk for gf and cf" into main am: 9bfce20efd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795597

Change-Id: I35303d6b534a037057f41ea58058a723342d8f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 21:00:14 +00:00
Treehugger Robot
9bfce20efd Merge "Add special paths for BoardConfig.mk for gf and cf" into main 2023-10-20 20:42:32 +00:00
Roman Kiryanov
8cc6b1181e Add special paths for BoardConfig.mk for gf and cf 
goldfish and cuttlefish are emulator and have
many boards which makes their device folders
very crowded. This change will allow to move
all boards into a dedicated folder.

This change will go away once a more consistent
approach to search for board configurations is
implemented.

Bug: 295259752
Test: presubmit
Change-Id: I78efe5a0ecd1ca9cffbadc7d7112f50e444ff7c3
Signed-off-by: Roman Kiryanov <rkir@google.com>
 2023-10-20 12:05:38 -07:00
Cole Faust
273b3b41ca Merge "Revert^2 "Enable genrule sandboxing by default"" into main am: 2fc2709115 am: 0aa8dea6e4 am: 884e3427b4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2796749

Change-Id: I1ddf4dc16ff4ea2d0e74269f4297bbc3fc5ee4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 03:18:23 +00:00
Sandeep Dhavale
a422d2858d Merge "Add support for specifying erofs blocksize" into main am: cc1a560241 am: ffc0e25f2b am: 5d6a4278b0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795057

Change-Id: I91f5e641a8af4eaf049127692edf510e9cba04d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 02:23:09 +00:00
Cole Faust
886fe4fded Merge "Add PRODUCT_PACKAGES to soong.variables" into main am: 3feef71409 am: 87b793b915 am: bcdd8c4d7a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2792192

Change-Id: I7e21de14264df6f412f58c53c0684fa5ba787640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-20 00:09:29 +00:00
Cole Faust
884e3427b4 Merge "Revert^2 "Enable genrule sandboxing by default"" into main am: 2fc2709115 am: 0aa8dea6e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2796749

Change-Id: I2c39e100f959cf7f2710de24cdce20ea15f77cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 23:22:50 +00:00
Cole Faust
1e037ed090 Merge "Revert^2 "Enable genrule sandboxing by default"" into main am: 2fc2709115 
Original change: https://android-review.googlesource.com/c/platform/build/+/2796749

Change-Id: I2874ee35b6d2cf1d4a65b5ffe55de739b9c4d3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 23:22:21 +00:00
Cole Faust
0aa8dea6e4 Merge "Revert^2 "Enable genrule sandboxing by default"" into main am: 2fc2709115 
Original change: https://android-review.googlesource.com/c/platform/build/+/2796749

Change-Id: Ia3185f7e18f4270f63b792ee4b6ca51284e3e74f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 23:20:08 +00:00
Cole Faust
2fc2709115 Merge "Revert^2 "Enable genrule sandboxing by default"" into main 2023-10-19 23:10:55 +00:00
Sandeep Dhavale
5d6a4278b0 Merge "Add support for specifying erofs blocksize" into main am: cc1a560241 am: ffc0e25f2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795057

Change-Id: Id296cc39d0dfdffc46502842fc751a248ba3e03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 23:03:36 +00:00
Sandeep Dhavale
ffc0e25f2b Merge "Add support for specifying erofs blocksize" into main am: cc1a560241 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795057

Change-Id: I253bb798863308a5f7a6f866f57ddbfb4778f09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 22:48:10 +00:00
Sandeep Dhavale
03c5c0cafd Merge "Add support for specifying erofs blocksize" into main am: cc1a560241 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795057

Change-Id: Id4901ae3c64790fe71539deae41deb4d1c0ba4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 22:45:56 +00:00
Sandeep Dhavale
cc1a560241 Merge "Add support for specifying erofs blocksize" into main 2023-10-19 21:46:58 +00:00
Cole Faust
bcdd8c4d7a Merge "Add PRODUCT_PACKAGES to soong.variables" into main am: 3feef71409 am: 87b793b915 
Original change: https://android-review.googlesource.com/c/platform/build/+/2792192

Change-Id: Iabe4c98c981dfb1e68c8156c4f8e1dc8bc29b73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 19:02:12 +00:00
Cole Faust
87b793b915 Merge "Add PRODUCT_PACKAGES to soong.variables" into main am: 3feef71409 
Original change: https://android-review.googlesource.com/c/platform/build/+/2792192

Change-Id: I45673a6f0183083415e845e57feb9a9a17275c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 18:30:47 +00:00
Cole Faust
3fda65df60 Merge "Add PRODUCT_PACKAGES to soong.variables" into main am: 3feef71409 
Original change: https://android-review.googlesource.com/c/platform/build/+/2792192

Change-Id: Ia4336f580f3d5bb07e9d27e9b6dcf7561e175f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 18:30:41 +00:00
Xin Li
d74507e2c1 Merge "Merge 10952656" into aosp-main-future 2023-10-19 17:59:03 +00:00
Cole Faust
b0990300e9 Revert^2 "Enable genrule sandboxing by default" 
50cd6b2a18

Change-Id: Ie0be9331481eb1e9b96034b155efb76a8be9596a
 2023-10-18 22:50:28 +00:00
Sandeep Dhavale
d7cc7e8f9a Add support for specifying erofs blocksize 
This change allows us to specify erofs filesystem block size
which will be used to create erofs image.

Either it can be specified at board level using
BOARD_EROFS_BLOCKSIZE. Or per read only partition image
using BOARD_<PARTITION>IMAGE_EROFS_BLOCKSIZE.

Examples:
BOARD_EROFS_BLOCKSIZE := 16384 OR
BOARD_PRODUCTIMAGE_EROFS_BLOCKSIZE := 16384

Bug: 303316443
Test: m and file ${ANDROID_PRODUCT_OUT}/*.img

Change-Id: I9bf3d299ae02165d0bffc62f474a302408d8b9b9
Signed-off-by: Sandeep Dhavale <dhavale@google.com>
 2023-10-18 08:23:36 -07:00
Wei Li
c134b76375 Initial implementation of layoutlib SBOM generation. 
1) Build/dist build.prop, resource files
2) Generate layoutlib SBOM that includes build.prop, resource files,
   font files and font configuration files
3) Generate SBOM of framework_res.jar with placeholders for substitution
   in release_layoutlib.sh

Bug: 303903787
Bug: 303904046
Bug: 303904808
Bug: 303905932
Bug: 303906000
Bug: 303906275
Test: lunch sdk_phone64_arm64-userdebug && m layoutlib dist
Change-Id: Ib004e199e740ccc901e93b11201db2477464be1d
 2023-10-17 23:52:30 -07:00
Mateusz Cicheński
6f556038ea Merge "Revert "Enable genrule sandboxing by default"" into main am: 2db3a45d8d am: af1f9a68f2 am: 4d06f4d22a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794133

Change-Id: Iaf2bee65ef4e8e4a24497d5ba84581dbb0dbca4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 22:29:09 +00:00
Mateusz Cicheński
4d06f4d22a Merge "Revert "Enable genrule sandboxing by default"" into main am: 2db3a45d8d am: af1f9a68f2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794133

Change-Id: I9ed8bbba3daa906d0ba9b960323b619bdcd60778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 21:37:00 +00:00
Mateusz Cicheński
44d6b94afa Merge "Revert "Enable genrule sandboxing by default"" into main am: 2db3a45d8d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794133

Change-Id: I2b43accb8e58bd1dd6d1bd7e886ac65a6162c21f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 21:07:12 +00:00
Mateusz Cicheński
2db3a45d8d Merge "Revert "Enable genrule sandboxing by default"" into main 2023-10-17 21:04:57 +00:00
Mateusz Cicheński
50cd6b2a18 Revert "Enable genrule sandboxing by default" 
Revert submission 2782270-genrule_sandboxing_by_default

Reason for revert: Potential culprit for b/305851039 and many other build breakages - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2782270-genrule_sandboxing_by_default

Change-Id: I3a8eb5d3a6a9e0d51ed7798c99187e9ca236b7bd
 2023-10-17 17:36:43 +00:00
Xin Li
688de9e5f5 Merge 10952656 
Merged-In: I9d5b022abee730aa5f07a8cfa87bcae59572d653
Change-Id: I04447977fa3a0f621f3e9ea9b36e6b84c8646787
 2023-10-17 10:21:05 -07:00
Cole Faust
a4e25c1933 Merge "Enable genrule sandboxing by default" into main am: 2f07f035cc am: 732b0b3bea am: fe5018b5ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/2782270

Change-Id: Ia56567cb0283ac184564f36d6a2dd0c2e78fd94f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 02:06:38 +00:00
Cole Faust
fe5018b5ae Merge "Enable genrule sandboxing by default" into main am: 2f07f035cc am: 732b0b3bea 
Original change: https://android-review.googlesource.com/c/platform/build/+/2782270

Change-Id: I5763591d1ea5b1827977f53f55fc96136cfff353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-17 01:33:33 +00:00