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
Wei Li
94f0d12de2 Include following files in the SBOM of layoutlib, which are disted in Soong. 
layoutlib.jar, from module layoutlib
icu*.data, from module icu-data_host_i18n_apex
libicuuc_stubdata.dll, from module libicuuc_stubdata
libicuuc-host.dll, from module libicuuc

See https://cs.android.com/search?q=%22targets:%20%5B%5C%22layoutlib%5C%22%5D%22&ss=android%2Fplatform%2Fsuperproject%2Fmain

The static dependencies of java_library and cc_library have not been included and will be handled in later CLs.

Bug: 303905932
Bug: 303904827
Bug: 303905759
Test: lunch sdk_phone64_arm64-userdebug && m layoutlib dist; CIs
Change-Id: I0c04fed2872b674a460a4a08880e67a6311890c4
 2023-10-30 17:04:58 -07:00
Treehugger Robot
d07b60ee71 Merge "Add a phony target for mk2bp_remaining files." into main am: 4c56f45c50 am: b40c808d89 am: b597067044 
Original change: https://android-review.googlesource.com/c/platform/build/+/2809898

Change-Id: Id938ed38cd1e3dec65001d98df1a44fac0e01445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 23:40:19 +00:00
LaMont Jones
1dc07fa574 release_config: build flags can be lists 
Allow a build flag definition to indicate that its value should be the
concatentation of assignements, rather than the final assigned value. In
this case, the "default" value from the flag definition is always
present as the start of the list.

The initial use case for this is RELEASE_ACONFIG_VALUE_SETS, where we
need apply multiple definition files that should be processed to arrive
at the final value.

Bug: b/302593603, b/304814040
Test: manual
Change-Id: I2474cdf23341f9b1682affce6cc784281557655d
 2023-10-30 23:40:04 +00:00
LaMont Jones
c6631fed48 Add support for product-specific build flags 
1. release config maps now specify where the flag definitions are found.
2. PRODUCT_RELEASE_CONFIG_MAPS specifies additional release config map
   files to use.

This allows product config to specify build flags, which can then be
specified by users of that product.

Bug: b/302593603
Test: manual
Change-Id: I660a3d88c2aaecc14d6f370bebb0d05a8cc224f2
 2023-10-30 23:40:04 +00:00
Treehugger Robot
f7ef93bbd1 Merge "Add a phony target for mk2bp_remaining files." into main am: 4c56f45c50 
Original change: https://android-review.googlesource.com/c/platform/build/+/2809898

Change-Id: I37a059fbc091f4282ba5fbbb647ded74d3e2f4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 23:07:54 +00:00
Treehugger Robot
b40c808d89 Merge "Add a phony target for mk2bp_remaining files." into main am: 4c56f45c50 
Original change: https://android-review.googlesource.com/c/platform/build/+/2809898

Change-Id: If980aecc15f2444151b214515e000b735739157a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 22:39:09 +00:00
Wei Li
c959f174a2 Merge "Generate SBOM of .kcm files in layoutlib." into main am: 52c2ea6a18 am: e63513dfac am: bee0f74c89 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802550

Change-Id: I6a3c19ab479d12efaeba88ccafa450ebcd181e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 20:04:25 +00:00
Wei Li
bee0f74c89 Merge "Generate SBOM of .kcm files in layoutlib." into main am: 52c2ea6a18 am: e63513dfac 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802550

Change-Id: I0b0b890d32c2666d91e4be68bc4c5e58f3ef878d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 19:22:50 +00:00
Wei Li
2e84027864 Add a phony target for mk2bp_remaining files. 
Bug: 308452586
Test: m mk2bp_remaining; CIs
Change-Id: I3d9242db500232da281f148da6b8205ada0b72e2
 2023-10-30 11:20:13 -07:00
Wei Li
dfa5b28ce5 Merge "Generate SBOM of .kcm files in layoutlib." into main am: 52c2ea6a18 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802550

Change-Id: Ie5a656938763a1d8372a948572ddfc5f74274191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 17:56:15 +00:00
Wei Li
e63513dfac Merge "Generate SBOM of .kcm files in layoutlib." into main am: 52c2ea6a18 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802550

Change-Id: I8ebd5879a7b317d272f55ef923e4510b87ce9687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 17:54:11 +00:00
Wei Li
52c2ea6a18 Merge "Generate SBOM of .kcm files in layoutlib." into main 2023-10-30 17:37:09 +00:00
Justin Yun
5dd0b8a98f Merge "Remove ro.product.vndk.version property" into main am: b81aa10eba am: c8651b789a am: e207017e05 
Original change: https://android-review.googlesource.com/c/platform/build/+/2803633

Change-Id: Icc218f8035afaa30a0f387076549c016b604f75d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 06:17:35 +00:00
Justin Yun
f1ed26972e Merge "Remove ro.product.vndk.version property" into main am: b81aa10eba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2803633

Change-Id: I579d591e857fef6799b3fe404b5c89096196c8a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 05:43:44 +00:00
Justin Yun
c8651b789a Merge "Remove ro.product.vndk.version property" into main am: b81aa10eba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2803633

Change-Id: I66b76264bc428fc45f87a70bf37a3f864f50348d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 05:14:29 +00:00
Justin Yun
b81aa10eba Merge "Remove ro.product.vndk.version property" into main 2023-10-30 05:01:44 +00:00
Treehugger Robot
499cb3476b Merge "De-duplicate kernel module names" into main am: a997e48000 am: da7e14b9e5 am: cf0c76fa0d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I84433b84a581029fec8e72fa640b4d1620ace7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 20:33:35 +00:00
Treehugger Robot
cf0c76fa0d Merge "De-duplicate kernel module names" into main am: a997e48000 am: da7e14b9e5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I71381dfda3a543c22d1b0b38203fe06f552b3828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 19:58:30 +00:00
Treehugger Robot
3a5de12447 Merge "De-duplicate kernel module names" into main am: a997e48000 
Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I0939c86aa6339e838089573b60d6b30f2a246166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 19:37:25 +00:00
Treehugger Robot
da7e14b9e5 Merge "De-duplicate kernel module names" into main am: a997e48000 
Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I91b8b475fc874ca3fd7e64072458effcd071a693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 19:35:01 +00:00
Treehugger Robot
a997e48000 Merge "De-duplicate kernel module names" into main 2023-10-26 19:02:38 +00:00
Ted Bauer
67880ef5ce Merge "Revert "Do not generate aconfig_flags.textproto"" into main am: 6866204083 am: ebdb7b84fd am: baf9602200 
Original change: https://android-review.googlesource.com/c/platform/build/+/2803994

Change-Id: Icc2ab8c35df5202bd8daab122e29b2fa2ed88d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 18:14:21 +00:00
Ted Bauer
baf9602200 Merge "Revert "Do not generate aconfig_flags.textproto"" into main am: 6866204083 am: ebdb7b84fd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2803994

Change-Id: I58dffbcc9c9015d726f21024fe435f5e80d95bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 17:41:34 +00:00
Kelvin Zhang
57f23bf317 De-duplicate kernel module names 
If BOARD_KERNEL_MODULES_16K contains duplicate kernel modules under
different directories, build will fail with 'multiple overriding
commands error' . To fix it, de-dup BOARD_KERNEL_MODULES_16K base on the
basename of kernel modules files.

Test: th
Change-Id: I45d850d5b3804c54b9ec0133d3a657c2db5adb17
 2023-10-26 10:29:55 -07:00
Ted Bauer
2e02bb7fc7 Merge "Revert "Do not generate aconfig_flags.textproto"" into main am: 6866204083 
Original change: https://android-review.googlesource.com/c/platform/build/+/2803994

Change-Id: Iaf6db998aef886eb038cf5ce129fa773b7114df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 17:18:46 +00:00
Ted Bauer
ebdb7b84fd Merge "Revert "Do not generate aconfig_flags.textproto"" into main am: 6866204083 
Original change: https://android-review.googlesource.com/c/platform/build/+/2803994

Change-Id: I36e89107465639367539a00b61074f20ca5f6282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 17:16:34 +00:00
Ted Bauer
6866204083 Merge "Revert "Do not generate aconfig_flags.textproto"" into main 2023-10-26 16:46:57 +00:00
Ted Bauer
49fbb31fcf Revert "Do not generate aconfig_flags.textproto" 
This reverts commit 0ac5304598.

Reason for revert: unbreak FlagFlipper

Test: m
Change-Id: I3c00d97bcb39d50a54b46fb61eaa30e8fcb0c9a5
 2023-10-26 10:59:34 -04:00
Treehugger Robot
21bc61ebea Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main am: 07f84b7b17 am: fa0091a912 am: fa58c8aa2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794713

Change-Id: I2385f7fe7f558458b8af2b388a929b6e4448f6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 22:55:10 +00:00
Wei Li
ee4ab5359d Generate SBOM of .kcm files in layoutlib. 
Bug: 303905932
Test: CIs; m layoutlib dist
Change-Id: Iab35c44bdfff7ea82734a8efd37dfa005bae2664
 2023-10-25 15:49:26 -07:00
Treehugger Robot
fa58c8aa2b Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main am: 07f84b7b17 am: fa0091a912 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794713

Change-Id: Ica324fbafcd30ee37aa05a864f2c7b0eef554636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 22:23:54 +00:00
Treehugger Robot
e8c4106678 Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main am: 07f84b7b17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794713

Change-Id: If68f49a25b1ff672d4e420c14715ff81f6b8772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 22:02:54 +00:00
Treehugger Robot
fa0091a912 Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main am: 07f84b7b17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2794713

Change-Id: I31deb3c465031bf5ed06a52f5eb7c8b82ba4ef4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 22:00:46 +00:00
Kelvin Zhang
160762a276 Use deterministic salt for AVB footer of prebuilt boot img 
When target specified a prebuilt boot.img, current build system will add
avb hash footer to it with a random salt. Use a deterministic salt
instead for more reproducible builds. To stay consistent with
non-prebuilt boot.img code path, we extract the kernel image from
prebuilt boot.img and uses sha256sum of kernel image as the salt.

Test: th
Bug: 293313353
Change-Id: I988999ddc4f18e0b8677b05a3165c847b6a11b52
 2023-10-25 13:28:11 -07:00
Wei Li
a7b3da9771 Merge "Add key character maps to layoutlib dist files" into main am: b3731e0db2 am: e8f77226d0 am: 21eaff44ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802643

Change-Id: Iae7a953146c47a6d4f695574d72ff6eaa8170722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 18:59:42 +00:00
Wei Li
21eaff44ad Merge "Add key character maps to layoutlib dist files" into main am: b3731e0db2 am: e8f77226d0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802643

Change-Id: I8e25237a47c08bea5bc2c2577a5c0c4f2bdae8fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 18:28:34 +00:00
Wei Li
7ee41516be Merge "Add key character maps to layoutlib dist files" into main am: b3731e0db2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802643

Change-Id: I7564c59603eb089bc09980fb78425f4b2a92c51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 18:09:09 +00:00
Wei Li
e8f77226d0 Merge "Add key character maps to layoutlib dist files" into main am: b3731e0db2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802643

Change-Id: I7f0c14502d15b00ba7d84169a9ca47d4de7eb453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 18:07:21 +00:00
Justin Yun
f71c221f40 Remove ro.product.vndk.version property 
Product modules no longer use vndk libraries but install them to
/product/lib[64].

Test: lunch cf_x86_64_phone-next-userdebug; m
Test: atest GtsVndkDependencyTestCases
Bug: 299867815
Bug: 302255959
Change-Id: I67614457c83f0f18eba7dc1d8259efeb5795807b
 2023-10-25 13:24:29 +09:00
Jerome Gaillard
ea9dab478c Add key character maps to layoutlib dist files 
This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1894ff5c78ca33be85d983d28be42870bac0bed0)
Merged-In: I147159912f85daafc97364468d6a6c2cfa3916b8
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in core/Makefile, hunk HunkHeader[7006,8->7006,8]: Hunk cannot be applied

Original patch:
 From 1894ff5c78ca33be85d983d28be42870bac0bed0 Mon Sep 17 00:00:00 2001
From: Jerome Gaillard <jgaillard@google.com>
Date: Mon, 24 Oct 2022 16:30:25 +0100
Subject: [PATCH] Add key character maps to layoutlib dist files

This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8
---
 2023-10-25 01:15:53 +00:00
Baligh Uddin
4c09638237 Merge "Move most version variable out to relase configs." into main 2023-10-24 23:39:55 +00:00
Colin Cross
d86724e7a0 Merge "Make checkbuild depend on blueprint_tests" into main am: ea9d5cfbeb am: 425cc7f15c am: 1cf6df43d2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802294

Change-Id: Icf5e86e1ea5059036a981bd480b56631058517b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 23:31:52 +00:00
Colin Cross
1cf6df43d2 Merge "Make checkbuild depend on blueprint_tests" into main am: ea9d5cfbeb am: 425cc7f15c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802294

Change-Id: I71f6ac654e6c599b99384341427b739e50cd217c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 23:00:10 +00:00
Colin Cross
fd871ebe03 Merge "Make checkbuild depend on blueprint_tests" into main am: ea9d5cfbeb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802294

Change-Id: Ie8af6af22c1c7fa33ca69ad500af9e2397a57c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 22:40:45 +00:00
Colin Cross
425cc7f15c Merge "Make checkbuild depend on blueprint_tests" into main am: ea9d5cfbeb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2802294

Change-Id: I6b75e9b20af5c7229a1ed0c48371b0b5557ce5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 22:38:52 +00:00
Baligh Uddin
68d906b32c Merge "Move most version variable out to relase configs." into aosp-main-future am: cd7f8346ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25164442

Change-Id: I81a42d2464300ec093a1f5ba1db851e2c6f6169a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 19:39:19 +00:00
Baligh Uddin
1bb039368e Merge "Revert^2 "Move most version variable out to relase configs."" into main 2023-10-24 19:12:51 +00:00
Baligh Uddin
cd7f8346ec Merge "Move most version variable out to relase configs." into aosp-main-future 2023-10-24 19:12:28 +00:00
Wei Li
d2c966dfc2 Merge "Initial implementation of layoutlib SBOM generation." into main am: 420d7d5878 am: 66b9807e09 am: 335a21390a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2795634

Change-Id: Ib4ab65d664dc5f2ad5b390e3c7d54386af66d05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-24 18:06:51 +00:00
Colin Cross
df85b8691e Make checkbuild depend on blueprint_tests 
The Soong tests are being disabled by default, add them as a manual
dependency of checkbuild to esnure they still run in CI.

Bug: 269296618
Test: aninja -t path checkbuild out/host/linux-x86/bin/go/soong-java/test/test.passed
Change-Id: Ice9b5ecdef8455cd0b173edbac141861cffc28c1
 2023-10-24 10:59:40 -07:00