StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,555 Commits 1 Branch 0 Tags
17607064618e5b6e25f6b34e9a455df5c29f73e6
Commit Graph

37910 Commits

Author SHA1 Message Date
Dennis Shen
1760706461 Merge "Treat system_ext as system in container designation" into main am: 6940b7898d am: b0d8105009 
Original change: https://android-review.googlesource.com/c/platform/build/+/3261300

Change-Id: I2fa3f3306cd29b7d730020fd015930dfbc899f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-13 02:20:12 +00:00
Dennis Shen
b3681ad5c6 Treat system_ext as system in container designation 
Bug: b/365135457
Test: m
Change-Id: Iece264cdd49d84ef0e5acccdbcf68059c876395f
 2024-09-12 23:32:03 +00:00
Treehugger Robot
ae8f73bb36 Merge "Move create_root_structure.mk to the dont_bother block." into main am: 435145d063 am: 9188de2042 
Original change: https://android-review.googlesource.com/c/platform/build/+/3261781

Change-Id: Ibd01ca93ea60f57f9def2a78005f8b2b3b34d25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 08:47:38 +00:00
Treehugger Robot
435145d063 Merge "Move create_root_structure.mk to the dont_bother block." into main 2024-09-12 08:29:21 +00:00
Treehugger Robot
e468ef50c3 Merge "Move building bootloader/radio image task to proper place" into main am: c2b351babb am: f00af6db55 
Original change: https://android-review.googlesource.com/c/platform/build/+/3261778

Change-Id: Icdcda9c442d1ea2c0f5b8e3722393cea66f1a65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 07:43:41 +00:00
Treehugger Robot
c2b351babb Merge "Move building bootloader/radio image task to proper place" into main 2024-09-12 07:22:38 +00:00
Treehugger Robot
c170e080a2 Merge "Add a new Soong config variable EMMA_INSTRUMENT" into main am: 1d09815d07 am: 44b86ab2c2 
Original change: https://android-review.googlesource.com/c/platform/build/+/3247731

Change-Id: Ib4c6f9e8bd8d7c5da59a00c5830ecc1dc0bef697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 03:21:06 +00:00
Treehugger Robot
1d09815d07 Merge "Add a new Soong config variable EMMA_INSTRUMENT" into main 2024-09-12 03:09:24 +00:00
Treehugger Robot
fd552de10e Merge "Add 16K boot image and dtbo image to dependency list of target files" into main am: ec37b55bc8 am: 8206631a1e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3264300

Change-Id: I6794d88b3c506d865bd52b3eb66053efd4b8245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 00:45:12 +00:00
Treehugger Robot
582de92ec0 Merge "Add soong system image configs" into main am: 0908f9d93d am: f1908a5945 
Original change: https://android-review.googlesource.com/c/platform/build/+/3235506

Change-Id: I0af137c15a1e7d76e409c1d0301281281a036a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 00:44:33 +00:00
Treehugger Robot
ec37b55bc8 Merge "Add 16K boot image and dtbo image to dependency list of target files" into main 2024-09-12 00:29:16 +00:00
Treehugger Robot
0908f9d93d Merge "Add soong system image configs" into main 2024-09-12 00:25:22 +00:00
Kelvin Zhang
8ac5145307 Add 16K boot image and dtbo image to dependency list of target files 
In aosp/3236458 these two artifacts are added to target-files.zip, but
they are not listed as dependency of target-files.zip. Depending on
build order and clean spec, sometimes this leads to missing files.

Test: th
Change-Id: I70e3b3691e77112c2427d95930b0c27a8042884b
 2024-09-11 16:31:06 -07:00
Treehugger Robot
e8d128c350 Merge "Move copy destination to "sts-sdk"" into main am: 6fbebd4570 am: 3d9f7146e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/3254921

Change-Id: I31a53129e713703540a62a86eed2439d7ada5a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 22:15:00 +00:00
Treehugger Robot
6fbebd4570 Merge "Move copy destination to "sts-sdk"" into main 2024-09-11 21:58:14 +00:00
Treehugger Robot
c592fca2a3 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main am: edb3ba3ae4 am: 03fba52422 
Original change: https://android-review.googlesource.com/c/platform/build/+/3260543

Change-Id: Ia3e7900966675813cdbb678f2dc6350e348275c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 20:53:21 +00:00
Treehugger Robot
edb3ba3ae4 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main 2024-09-11 20:33:35 +00:00
Colin Cross
757d8cb7fd Add missing vendor_kernel_ramdisk dependency to target-files.zip 
The rule that builds target-files.zip has no dependency on the
vendor_kernel_ramdisk image, which means the files in that image
may not be in place when target-filse.zip is built, causing a
build error:
mkbootfs: cannot open directory '/mnt/disks/build-disk/src/googleplex-android/aosp-main-future-without-vendor/out/target/product/cheetah/obj/PACKAGING/target_files_intermediates/aosp_cheetah-target_files/VENDOR_KERNEL_BOOT/RAMDISK': No such file or directory

Add the missing dependency.

Bug: 365887100
Test: none
Flag: EXEMPT bugfix
Change-Id: I5cdec9bbb35970e4d5e27a6b10ad118ce11835a9
 2024-09-11 11:03:36 -07:00
Nelson Li
87ef4b8aee Move create_root_structure.mk to the dont_bother block. 
Bug: 353642907
Test: m -j init.environ.rc
Change-Id: I54671a194dbf2005286cb8386cafd93fbef75975
 2024-09-11 16:46:45 +08:00
Justin Yun
c9dd2d5b2e Add soong system image configs 
USE_SOONG_DEFINED_SYSTEM_IMAGE is true when the target is using a
system image defined in soong.
PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE is the module name of the soong
defined system image.

Bug: 350599535
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-userdebug
      && m
Change-Id: Ic5c848fb649a5a61de1a5a253438b2d77d200a6b
 2024-09-11 05:06:42 +00:00
Herbert Xue
48ab2f75c2 Move building bootloader/radio image task to proper place 
Move the task of building bootloader/radio images and unpack their
partitions to build/core/tasks/tools.

Bug: 359426542
Test: presubmit
Change-Id: I3ac1a1a6eb0e21fb1eac6db628e094a13c9fc73f
 2024-09-11 10:04:16 +08:00
Treehugger Robot
0af3dd86be Merge "Move the creation of the root structure to build/core/main.mk" into main am: 963298af97 am: 2af5d1063f 
Original change: https://android-review.googlesource.com/c/platform/build/+/3261773

Change-Id: I4ae21b49d5963f10c3c554d10b7b09e80fbd6633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 01:15:14 +00:00
Treehugger Robot
963298af97 Merge "Move the creation of the root structure to build/core/main.mk" into main 2024-09-11 01:01:40 +00:00
Cole Faust
ff18b719e4 Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main am: f4053ef8c0 am: c98308a9e7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3261335

Change-Id: I10018cfeeda7531b925b99d1c3f9b2e9eec43cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-10 19:42:33 +00:00
Cole Faust
f4053ef8c0 Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main 2024-09-10 19:33:04 +00:00
Nelson Li
1646e5c028 Move the creation of the root structure to build/core/main.mk 
Since Soong currently doesn't support the `install_directory`
functionality, `system/core/rootdir/Android.mk` cannot be directly
converted to Android.bp. Moreover, its main content is to create
directories and symlinks for the root file system. Therefore, we'll
first rename it and move it to build/core/main.mk for handling.

In addition, consolidate the handling of meta-lic related parts into
`build/core/tasks/meta-lic.mk`.

Bug: 353642907
Test: m -j init.environ.rc
Change-Id: Ie8f8bcae5752d22c331b33a33981a959410f0a69
 2024-09-10 06:51:10 +00:00
Cole Faust
f72ec7ae1d Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES 
It's been available for over a year, lets progress the python3 migration
by removing it.

Bug: 203436762
Test: Presubmits
Change-Id: I4193767a6a72a527eeca56fbabe477bee9e21c7a
 2024-09-09 18:08:01 -07:00
Xin Li
7c11265724 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:23 +00:00
Treehugger Robot
ee7c14dc15 Merge "Revert "Revert "Export variable to soong for converting vintf_co..."" into main am: 86514e58df am: a7626f7998 
Original change: https://android-review.googlesource.com/c/platform/build/+/3256525

Change-Id: Iccf78f65821902f9ff62c7d11ecbea2664c2d416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-06 01:03:27 +00:00
Treehugger Robot
a7626f7998 Merge "Revert "Revert "Export variable to soong for converting vintf_co..."" into main am: 86514e58df 
Original change: https://android-review.googlesource.com/c/platform/build/+/3256525

Change-Id: I0c68673fed567ef5b33bb73868eda44795a644d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-06 00:53:23 +00:00
Treehugger Robot
86514e58df Merge "Revert "Revert "Export variable to soong for converting vintf_co..."" into main 2024-09-06 00:48:26 +00:00
Bill Yang
01c18ba25c Revert "Revert "Export variable to soong for converting vintf_co..." 
Revert submission 3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Reason for revert: The root cause of the break is already be merged. Related changes: ag/29139095, ag/29139608

Reverted changes: /q/submissionid:3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Change-Id: I40d9e6c03dd092783e86338a334851a36f5488dd
 2024-09-05 09:22:17 +00:00
Chris Dombroski
daca2e7783 Move copy destination to "sts-sdk" 
Also remove packaged Java

Bug: 364712647
Test: manual
Change-Id: I5b32aaa7b13ca5f4967e6214ce81dbe3fbd58791
 2024-09-04 23:07:02 +00:00
Colin Cross
01a9d7b58a Merge "Move checkbuild targets of Soong modules into Soong" into main am: d41d4149f6 am: e21cb30040 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236363

Change-Id: Ia7ec264667a25cb68f566201a80ea7bd0b3a7614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:24:17 +00:00
Colin Cross
e21cb30040 Merge "Move checkbuild targets of Soong modules into Soong" into main am: d41d4149f6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236363

Change-Id: I2940228144e026f91f2ef7dc8f4a2355450997b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:15:13 +00:00
Colin Cross
d41d4149f6 Merge "Move checkbuild targets of Soong modules into Soong" into main 2024-09-04 17:12:03 +00:00
Treehugger Robot
6b0523139e Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main am: 6ed53f2e44 am: 54ab3cf7b3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3249611

Change-Id: I534c6102dfa739bc99a39424a8dbe3fb7d62760a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 04:46:53 +00:00
Treehugger Robot
54ab3cf7b3 Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main am: 6ed53f2e44 
Original change: https://android-review.googlesource.com/c/platform/build/+/3249611

Change-Id: Icc6f1bd00a05d478da2311fa13d909c79868f729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 04:37:45 +00:00
Treehugger Robot
6ed53f2e44 Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main 2024-09-04 04:27:06 +00:00
Steven Moreland
dbb518c74a Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main am: 9d3787b166 am: 58ff2ba627 
Original change: https://android-review.googlesource.com/c/platform/build/+/3248862

Change-Id: Iaff8b55114ea0082cce76cec34d78c42dc962328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 00:06:05 +00:00
Steven Moreland
58ff2ba627 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main am: 9d3787b166 
Original change: https://android-review.googlesource.com/c/platform/build/+/3248862

Change-Id: I3aad2af970caf38cf32ffb7a5e28178591ec2574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 23:56:21 +00:00
Steven Moreland
9d3787b166 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main 2024-09-03 23:44:16 +00:00
Steven Moreland
357d069f7f Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND. 
Hint to partners this will go away. We have limited
testing of this option, and we shouldn't maintain two
ways of handling NDK AIDL variants. So, this way
we can remove it in the future. :D

Bug: 161456198
Test: build
Change-Id: I5ae43b4f1b6c0d7253e82caeb338b69b7e00fdb6
 2024-08-30 23:28:23 +00:00
Treehugger Robot
87854874d4 Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main am: 2091dc30e2 am: d0b36a410f 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236458

Change-Id: I957f9cbc463bb051f343dbae71d1fd5641f38b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 23:38:30 +00:00
Treehugger Robot
d0b36a410f Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main am: 2091dc30e2 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236458

Change-Id: I1f4d2c41546df89e37af0085fb755f79981752f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 23:28:59 +00:00
Treehugger Robot
2091dc30e2 Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main 2024-08-29 23:26:15 +00:00
Cole Faust
df79b65cd9 Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main am: da669fa5f0 am: 3c9e58c565 
Original change: https://android-review.googlesource.com/c/platform/build/+/3247886

Change-Id: I14cb5ee362853353686486d4336f9d0a02ec5ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 22:22:24 +00:00
Cole Faust
3c9e58c565 Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main am: da669fa5f0 
Original change: https://android-review.googlesource.com/c/platform/build/+/3247886

Change-Id: I499de7eb93d7399ae10b81918295838bb6e9505d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 22:14:19 +00:00
Kelvin Zhang
8948d13afc Add boot_16k.img and dtbo_16k.img to target_files 
During signing, we need to re-generate dev option OTAs, as the 4K boot
images are getting signed with a different key. To allow generating
incremental OTAs for boot OTAs, include 16K variant of the boot images.

Test: th
Bug: 339658378
Change-Id: I0aafd5f48dbefeb2b86fd8bd93f6ce4d3f28a3cd
 2024-08-29 13:38:45 -07:00
Herbert Xue
3e3cbeb3a5 Move COMPATIBILITY.tradefed_tests_dir to proper place 
Bug: 341873065
Test: presubmit
Change-Id: Ibd99b07b8548eafb72254fda2a248b9ec32ee8ef
 2024-08-29 14:46:50 +08:00