StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,307 Commits 1 Branch 0 Tags
b30a23cca2bc1a433bed8429f9da1bd5bc240eb8
Commit Graph

28724 Commits

Author SHA1 Message Date
Devin Moore
6363a04e79 Merge changes from topic "init_boot_img" 
* changes:
  Update releasetools for new init_boot.img
  Build a new init_boot.img that contains the boot ramdisk
 2021-12-22 23:21:17 +00:00
Dan Willemsen
1637c37d21 Fix make conditional 
`ifeq (foo,foo,)` is treated like `foo == foo,` which is not what we
want here, we want to clear this variable for user builds.

Change-Id: I57f92c7267102c9f3ac2b0130228de0b3036ac66
 2021-12-21 21:54:19 +00:00
Inseob Kim
f6e4b7b769 Merge "Add sepolicy prebuilt dirs and variables to config" 2021-12-21 07:09:58 +00:00
Xin Li
3aec887b7e Merge "Merge SP1A.211205.008" 2021-12-21 05:02:44 +00:00
Inseob Kim
bfe25fe702 Add sepolicy prebuilt dirs and variables to config 
These are used when we build vendor sepolicy against old plat sepolicy.

Bug: 33691272
Test: build
Change-Id: I847108539b3b9d7d25c0fad9eddc017275a564be
 2021-12-21 09:50:22 +09:00
Xin Li
90df2b43bc Merge SP1A.211205.008 
Bug: 205056467
Merged-In: Ic0dabce4beb09bdd966152c059730677ca5bf5aa
Change-Id: Ic9d5fe40d265ef8002ccbcf3182a2fb8b6239135
 2021-12-20 14:07:52 -08:00
Devin Moore
380d9e445c Build a new init_boot.img that contains the boot ramdisk 
This ramdisk used to be in boot.img, and is now placed into this new
init_boot.img instead.
This new image is used for a new init parition to seperate Android
platform artifacts from the kernel artifacts in boot.img.

Test: boot Cuttlefish
Bug: 203698939

Change-Id: Iaaf82486259979ab728730ce72a4e847ae005c18
 2021-12-20 20:54:14 +00:00
Ramji Jiyani
f9ce357613 Add symlink for system_dlkm modules 
Create symlinks for system_dlkm on devices with a
system_dlkm partition:

/system/lib/modules -> /system_dlkm/lib/modules

Bug: 200082547
Test: Manual boot with CF
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I8ddf340425cf92aa234f93f6b31bfd51cfa9c3f3
 2021-12-20 19:52:40 +00:00
Cole Faust
bd99de67c6 Merge "Export words function" 2021-12-16 21:16:49 +00:00
Treehugger Robot
32085e7bd7 Merge "Preserve all COMPATIBILITY_SUITES values in module-info" 2021-12-16 01:29:59 +00:00
Cole Faust
12beaaf4ac Merge "Create $(findstring) starlark implementation" 2021-12-15 21:32:27 +00:00
yangbill
6dd962fdda Preserve all COMPATIBILITY_SUITES values in module-info 
Extend COMPATIBILITY_SUITES in module-info to avoid overwriting previous
values. In particular, this happens for the `host-unit-tests` suite
which is automatically added by Soong rules only to be clobbered by the
modules that have both device and host variants.

Bug: 209806322
Test: source build/envsetup.sh ; lunch aosp_cf_x86_64_phone ;
      m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I56a2d4c9786ed3da1e788ba211ec1bcaa6559549
 2021-12-14 05:54:30 +00:00
Cole Faust
4db91af70c Create $(findstring) starlark implementation 
Bug: 201700692
Test: go test in other cl in the topic
Change-Id: Ibe7d600c9fe5335a1277e1572aa52f6c512c2951
 2021-12-13 16:35:54 -08:00
Inseob Kim
c95816ce4b Merge "Refactor sepolicy version related codes" am: e23891877c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1916858

Change-Id: Ib836574268ae722da7a06d53d2014daa5877a991
 2021-12-13 04:13:32 +00:00
Inseob Kim
e23891877c Merge "Refactor sepolicy version related codes" 2021-12-13 03:57:36 +00:00
Treehugger Robot
49da1ac76c Merge "Revert^2 "Reuse license metadata files from Soong"" am: f13d0b2f22 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918950

Change-Id: I5b572989961bf849cedd2da802b72361ef5fd778
 2021-12-11 03:48:24 +00:00
Treehugger Robot
f13d0b2f22 Merge "Revert^2 "Reuse license metadata files from Soong"" 2021-12-11 03:32:18 +00:00
Colin Cross
2e075808dd Merge "Revert "Reuse license metadata files from Soong"" am: 91a9483e87 
Original change: https://android-review.googlesource.com/c/platform/build/+/1918946

Change-Id: I85bbf851be4f5d2d3884f2c4652e32b0bcbd59b3
 2021-12-10 23:20:49 +00:00
Colin Cross
71d9919322 Revert^2 "Reuse license metadata files from Soong" 
81b167693f

Change-Id: Iff45cffb1f2b9d01cec70d96e34f46d35bb37842
 2021-12-10 23:05:02 +00:00
Colin Cross
91a9483e87 Merge "Revert "Reuse license metadata files from Soong"" 2021-12-10 23:04:45 +00:00
Colin Cross
81b167693f Revert "Reuse license metadata files from Soong" 
Revert "Escape Host*Variable contents"

Revert submission 1899703

Reason for revert: b/210158272
Reverted Changes:
I142c19284:Reuse license metadata files from Soong
Ife89b8f23:Add dependency license annotations
I8e7410837:Build license metadata files in Soong

Change-Id: Id9d66c01453aebe8a52eaa6628e9933a990d4c2f
 2021-12-10 23:03:08 +00:00
Cole Faust
98a7011088 Merge "Strip ODM_MANIFEST_SKUS" am: 01e022369b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1917097

Change-Id: I37ee8f0df0bcb212e0fc3add6b069e5857614747
 2021-12-10 22:05:31 +00:00
Colin Cross
b48261121e Merge "Reuse license metadata files from Soong" am: 6cf8ec77cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1900116

Change-Id: Id5db06a34777ff0a2bca39ffa0e083ca2a131a3d
 2021-12-10 22:04:39 +00:00
Cole Faust
01e022369b Merge "Strip ODM_MANIFEST_SKUS" 2021-12-10 22:02:22 +00:00
Colin Cross
6cf8ec77cc Merge "Reuse license metadata files from Soong" 2021-12-10 21:43:49 +00:00
Inseob Kim
7c708e2d27 Merge "Add BoardPlatVendorPolicy to soong config" am: f09eddd531 
Original change: https://android-review.googlesource.com/c/platform/build/+/1914612

Change-Id: I15f4771b72598028a380d15ca8f1c3421b07890d
 2021-12-10 12:29:48 +00:00
Inseob Kim
f09eddd531 Merge "Add BoardPlatVendorPolicy to soong config" 2021-12-10 12:13:36 +00:00
Inseob Kim
51c455bdb2 Refactor sepolicy version related codes 
1. Move BOARD_SEPOLICY_VERS to build/make/core/config.mk where
PLATFORM_SEPOLICY_VERSION is set.

2. Remove hard-coded versions for the treble tests.

Test: build
Change-Id: Iab338a1f16855205d62312d4247a15ea766be1fe
 2021-12-10 18:36:18 +09:00
Cole Faust
3203cba181 Export words function 
It will now be generated in mk2rbc as part of
foreach expressions.

Bug: 201700692
Test: None
Change-Id: I400563946d46d7cac9be901a80470248990800bd
 2021-12-09 14:26:03 -08:00
Cole Faust
d4fcff6db8 Merge "Allow multiple patterns in rblf_wildcard" am: 598cbbcde7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1915258

Change-Id: Ib9da4c5eb2ea775fb52b67ee4a6558aee4f0e5dc
 2021-12-09 21:50:21 +00:00
Cole Faust
598cbbcde7 Merge "Allow multiple patterns in rblf_wildcard" 2021-12-09 21:32:53 +00:00
Cole Faust
c8c516a89b Strip ODM_MANIFEST_SKUS 
Otherwise it gets a different value when using starlark
board config, causing the ninja files to differ.

Bug: 201700692
Test: ./build/bazel/ci/rbc_regression_test.sh -b aosp_crosshatch_car-userdebug
Change-Id: I55870f031b779202db720f10d7d502f9d868e1f6
 2021-12-09 10:30:19 -08:00
Cole Faust
fdff6b1e9c Allow multiple patterns in rblf_wildcard 
This is to match the functionality of make's $(wildcard)

Bug: 201700692
Test: go test
Change-Id: Ib20c4a4aa9642a2d76b5da5c7accd60e6b91c8fc
 2021-12-08 17:52:40 -08:00
Treehugger Robot
48b1b7e6f0 Merge "Explicitly set EROFS compression parameter" am: 1f9408b2b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1908390

Change-Id: I797ee4f2cf2bdc2b6f0e2107e28a57a4e6c99b10
 2021-12-09 01:11:02 +00:00
Treehugger Robot
1f9408b2b2 Merge "Explicitly set EROFS compression parameter" 2021-12-09 00:40:36 +00:00
Dan Willemsen
b66a55ea05 Merge "Add basic Darwin+Arm64 support as HOST_CROSS" am: e808bc4a09 
Original change: https://android-review.googlesource.com/c/platform/build/+/1883492

Change-Id: If566a5f3a588db74cc6d54d4c107c0f1c88bea4c
 2021-12-08 22:59:34 +00:00
Dan Willemsen
8820840d57 Add basic Darwin+Arm64 support as HOST_CROSS 
Soong will use this to turn on universal binary support (X86_64 + Arm64
in the same binary).

Bug: 203607969
Test: m sdk-repo-platform-tools sdk-repo-build-tools on Mac
Change-Id: I04612136a42e85f4add95202ce20e741d9aaa302
 2021-12-08 09:26:27 -08:00
Inseob Kim
d0f600a074 Add BoardPlatVendorPolicy to soong config 
Bug: 205924657
Test: build
Change-Id: I89697a82c6d288576ae066f82a067383ccd57e2e
 2021-12-08 22:53:02 +09:00
Treehugger Robot
37d01f684d Merge "Add missing apksigner dependency" am: 1295bc5138 
Original change: https://android-review.googlesource.com/c/platform/build/+/1891388

Change-Id: Ie10a161857ad6ecd4d3d5f2cf5a43a5f2c7a0e00
 2021-12-07 12:57:53 +00:00
Treehugger Robot
1295bc5138 Merge "Add missing apksigner dependency" 2021-12-07 11:43:06 +00:00
Treehugger Robot
793100509c Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" am: 0d8d378bd4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1910142

Change-Id: I36aa20e6861144f547955e4750c43f1cd011ffeb
 2021-12-07 04:52:20 +00:00
Treehugger Robot
0d8d378bd4 Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" 2021-12-07 04:33:01 +00:00
Treehugger Robot
9498b39594 Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" am: e813a4a023 
Original change: https://android-review.googlesource.com/c/platform/build/+/1908951

Change-Id: Ief74d2d1faf733bab6a86fed95cceea956c4ad03
 2021-12-06 21:42:56 +00:00
Treehugger Robot
e813a4a023 Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" 2021-12-06 21:40:10 +00:00
Cole Faust
d8b85632e3 Merge "Pass input variables to product config" am: 8fb2d83457 
Original change: https://android-review.googlesource.com/c/platform/build/+/1908233

Change-Id: I182cdec2014ebf8409ad192c1ffd82b2cda7cf5f
 2021-12-05 04:05:50 +00:00
Cole Faust
8fb2d83457 Merge "Pass input variables to product config" 2021-12-05 03:43:24 +00:00
Treehugger Robot
7939f4bca2 Merge "Add Soong variable for optimizing system Java" am: 742874e0e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1896612

Change-Id: I0ca5c029e3bc6213179d67f923cf962b6c0474eb
 2021-12-04 01:25:26 +00:00
Treehugger Robot
742874e0e6 Merge "Add Soong variable for optimizing system Java" 2021-12-04 01:07:34 +00:00
Colin Cross
4f8dd6fe45 Reuse license metadata files from Soong 
Copy the license metadata files from Soong if they've already
been built.

Bug: 207445310
Test: m checkbuild
Change-Id: I142c192843e94b018079809bd596ff81136b2de3
 2021-12-03 22:47:11 +00:00
Colin Cross
52a0c97e5a Revert "Revert "Move meta_lic files into per-module intermediates directories"" 
This reverts commit e41ad14f58.

Change-Id: I77211030b657b894002a1a1bded773b3c4b0334a
 2021-12-03 22:46:20 +00:00