StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,516 Commits 1 Branch 0 Tags
b51cfc63a5c2f6b9f58873241d7a79efa6e5c10c
Commit Graph

89516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cole Faust
c67e769b8c Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set 
LOCAL_SOONG_INSTALL_SYMLINKS can now be set by the install_symlink
module type. The install_symlink module type doesn't set
LOCAL_SOONG_INSTALLED_MODULE because make tries to copy that file
around, which doesn't work with a symlink.

Bug: 205632228
Test: built and ran the emulator observed the /system/bin/hwservicemanager symlink is still there
Change-Id: I1ec355b5ae057d0b7fe167674d70da6a4d03f6b5
 2023-09-05 14:16:38 -07:00
Xin Li
236f2cd5e3 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:36:11 +00:00
Treehugger Robot
6a5b171816 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: Id1108f202bdd118455ea80f2d72f5a3ab26b1bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:12:48 +00:00
Treehugger Robot
61291bb9a7 Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: If10df8b82643b13ebae55415b3281b20e92f59d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:12:08 +00:00
Treehugger Robot
6c4627369e Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main 
* changes:
  aconfig: add invariant checks for `is_fixed_read_only`
  aconfig: re-enable development with cargo
 2023-09-05 17:21:22 +00:00
Treehugger Robot
4d779cf4cd Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main 2023-09-05 16:55:20 +00:00
Jared Duke
2e2c2ab1b8 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I17e8b34094ac694729a58ef4f29333df1cc71cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 16:10:48 +00:00
Jared Duke
2674152fdc Merge "Ensure special Dalvik annotations are kept" into main 2023-09-05 15:49:17 +00:00
Nikita Ioffe
7902e5ed63 Propagate device assignment related flags to soong 
Bug: 298007909
Test: builds
Change-Id: I0513784c813c856e9cb4674f1e33a7d83e411b02
 2023-09-04 22:49:42 +01:00
Mårten Kongstad
21717e744e aconfig: add invariant checks for is_fixed_read_only 
Update parsed_flag::verify_fields to verify that the invariant "if a
parsed flag is_fixed_read_only, its permission must be READ_ONLY".

Note: commands.rs will ensure that no value files are used to create an
invalid parsed flag when flag declarations and values are parsed, but
the invariant check should still be added for completeness sake, and to
make sure no invalid hand-crafted test data exists.

Also fix invalid test data found by adding this invariant.

Bug: 298935897
Test: atest aconfig.test
Change-Id: I8cea5c4d28c458525b7034d78ecb34dd09272771
 2023-09-04 20:25:59 +02:00
Mårten Kongstad
5cfad6abd2 aconfig: re-enable development with cargo 
The integration tests introduced in 906405f5c9 depend on libraries
auto-generated by running aconfig. This works fine for the Android build
system, but breaks `cargo t`.

Disable the tests when using `cargo t` for local development. Cargo can
be used for rapid local development, including running unit tests;
integration tests should be run using atest.

Bug: 298904077
Test: cargo t
Test: atest aconfig.test_mode.test.rust aconfig.prod_mode.test.rust
Change-Id: Ifcd374fa6efdc121cbfd4c4ac4fb43cf9cacc192
 2023-09-04 13:22:28 +02:00
Kiyoung Kim
e68edc80c1 Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I3968b8e6773bb60cb8ef064af931536177eaa019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 09:00:11 +00:00
Kiyoung Kim
a28e56e1cc Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main 2023-09-04 08:09:56 +00:00
Treehugger Robot
d56c052f72 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Ib34308cf87d0c2c26055379ab117668fc6bf4f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 00:01:04 +00:00
Treehugger Robot
5da26c0ab3 Merge "Add the adevice host tool to standard builds" into main 2023-09-01 23:13:14 +00:00
Jared Duke
cb3505c1be Ensure special Dalvik annotations are kept 
These optimization annotations are special in that we don't want them
to have RUNTIME retention, but we do want them to be visible to ART.
R8 already has special rules to handle them, but with R8 full mode
it still requires a minimal keep rule for the given reference.

This allows usage of annotations like @NeverCompile from fully optimized
platform targets like SystemUI.

Bug: 215417388
Test: m + compare SystemUIGoogle.odex w/ @NeverCompile annotations
Change-Id: Id14bcc7b6d0d6dd385c60cfbe4d31f295cbaa5dc
 2023-09-01 21:27:30 +00:00
Joe Onorato
08d6ebf118 Add the adevice host tool to standard builds 
Test: treehugger
Change-Id: Ib8caceecbcc355f6aa8725a2f134f2d1ac86d387
 2023-09-01 13:24:51 -07:00
Treehugger Robot
5f0bd8a83f Merge "Don't read the odex zip files when building sbom-metadata.csv" into main am: db21a2aee5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2731043

Change-Id: I3540341c1534781b8e224c11370bade90768055f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 19:48:20 +00:00
Nikita Ioffe
c8a6acbce8 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main am: 68e7cb9c67 
Original change: https://android-review.googlesource.com/c/platform/build/+/2735632

Change-Id: I6784feb23a37909bd74caf5563cf4067f2ffb9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 19:47:55 +00:00
Treehugger Robot
db21a2aee5 Merge "Don't read the odex zip files when building sbom-metadata.csv" into main 2023-09-01 19:29:31 +00:00
Nikita Ioffe
68e7cb9c67 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main 2023-09-01 18:44:17 +00:00
Kelvin Zhang
62d130b2c2 Merge "Use seek() instead of writing 0s" into main am: dfa0c85705 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734171

Change-Id: Iccf7a483cc5202e913293e8692d8af244df3b7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 18:09:08 +00:00
Treehugger Robot
892071ae93 Merge "Mark boot OTAs as partial OTAs" into main am: 145ca3034f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2733819

Change-Id: Icdbfc74189a368807ae0d7f3ebf6384e4a3d672d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 18:08:19 +00:00
Kelvin Zhang
1738012f6d Reland: Add 16k/4k boot OTAs to /system partition 
This allows switching kernels without downloading anything from
internet.

Test: th
Bug: 293313353

This reverts commit 2610f34671.

Change-Id: Iec6c9f9404ac1bb3286613c33d79b00b20c4c8bb
 2023-09-01 17:04:43 +00:00
Kelvin Zhang
dfa0c85705 Merge "Use seek() instead of writing 0s" into main 2023-09-01 17:00:52 +00:00
Treehugger Robot
145ca3034f Merge "Mark boot OTAs as partial OTAs" into main 2023-09-01 16:58:26 +00:00
Treehugger Robot
6a69f07936 Merge "Add missing depdency for 16k boot image" into main am: 333d29dbb8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734625

Change-Id: I8b571c31548626dac3ca647cb12331c7dc266d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 15:39:06 +00:00
Treehugger Robot
333d29dbb8 Merge "Add missing depdency for 16k boot image" into main 2023-09-01 14:49:32 +00:00
Nikita Ioffe
53d1acaf11 Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong 
Bug: 298008232
Test: builds
Change-Id: I1ec0b2cefdac862d3704968046076b59664c2b5d
 2023-09-01 13:56:13 +01:00
Inseob Kim
387befd639 Merge "Remove code about mixed sepolicy build" into main am: 3c7a42328c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734338

Change-Id: Ib7f7344c4b493afe0e70603f069a20b04cd4c90e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 01:33:44 +00:00
Pawan Wagh
3ce34e4c5f Merge "Adding a system property to enable 16k dev options" into main am: 904c8194dd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2729459

Change-Id: I59781064b7861fc02b5234012a7e82f7d5d978d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 01:32:56 +00:00
Inseob Kim
3c7a42328c Merge "Remove code about mixed sepolicy build" into main 2023-09-01 01:06:38 +00:00
Pawan Wagh
904c8194dd Merge "Adding a system property to enable 16k dev options" into main 2023-09-01 00:26:13 +00:00
Kelvin Zhang
542a27eecf Add missing depdency for 16k boot image 
Bug: 298295675
Bug: 293313353
Test: th
Change-Id: I9679c151e77398e161c04487699bc3a0d776ab13
 2023-08-31 16:25:12 -07:00
Treehugger Robot
d894889dc9 Merge "Build the proguard dict zip without PACKAGING intermediates" into main am: bf5f9bf015 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734167

Change-Id: I17244b1f9de61e1128ded4864fbefd2884e95b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:23:46 +00:00
Kelvin Zhang
857824f7cd Merge "Resize boot_16k.img properly" into main am: a87ce9086f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2733818

Change-Id: I789e3839dd6c53c20d9739fd4dc97a97e7027651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:22:25 +00:00
Romain Jobredeaux
e13b1092c6 Merge "Expose global proguard flags for use by R8." into main am: 1fb1dd2fb1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2733475

Change-Id: I8bbe01de4070b1008e153e57e365867271b890f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 20:20:20 +00:00
Pawan Wagh
8253e12483 Adding a system property to enable 16k dev options 
16K dev option should be visible on particular devices which set
PRODUCT_16K_DEVELOPER_OPTION. Adding a system property which will be
enabled based on this option.

Test: m, booted device with PRODUCT_16K_DEVELOPER_OPTION ON/OFF and
verified option visibility.
Bug: 297922563

Change-Id: I6d1cd2ce0c6f38fb43222d8e1ac2b797ef675c62
 2023-08-31 20:08:31 +00:00
Treehugger Robot
bf5f9bf015 Merge "Build the proguard dict zip without PACKAGING intermediates" into main 2023-08-31 19:37:27 +00:00
Kelvin Zhang
a87ce9086f Merge "Resize boot_16k.img properly" into main 2023-08-31 19:17:34 +00:00
Kelvin Zhang
8aa6525ad7 Use seek() instead of writing 0s 
test_ZipWrite_large_file need to write a 4GB file to zipfile for
testing. Instead of writing sequence of 0s to the test file, use seek().

Test: th
Bug: 298138109
Change-Id: I886bfa0c3f21664e529ba7de9688909518148f61
 2023-08-31 12:17:14 -07:00
Kelvin Zhang
c4f737406a Mark boot OTAs as partial OTAs 
Boot partition only OTA must be marked as "partial". This is required
for update_engine to correctly copy non-updated partitions to the target
slot.

Test: th
Bug: 293313353
Change-Id: Ic89d03f214e12fa43f686d37854d6fed1d78a6a3
 2023-08-31 12:17:14 -07:00
Kelvin Zhang
bf2d400799 Resize boot_16k.img properly 
Bootloaders often assume boot partition to be 64MB in size. Correctly
size boot_16k.img so that bootloader can verify the AVB footers.

Test: th
Bug: 293313353
Change-Id: I322277b10e99a41c9a262ff76e2f29c3ed16fec0
 2023-08-31 12:17:14 -07:00
Xin Li
3a846b926f Merge UP1A.230905.019 
Merged-In: Ia5208702fc02d0e1ab53d1affc664363fba74a67
Change-Id: I7ba769565b1dbf56d6e00d85c87b7235b14a857a
 2023-08-31 12:08:31 -07:00
Romain Jobredeaux
1fb1dd2fb1 Merge "Expose global proguard flags for use by R8." into main 2023-08-31 18:54:49 +00:00
Devin Moore
22eb386535 Merge changes from topic "no_hidl_support" into main am: 01e56d0ae0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650297

Change-Id: I80fee5153e6ae4bdfb666faf2afc45f2e94372bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 16:22:50 +00:00
Devin Moore
278aea5ba4 Remove hwservicemanager and hidl allocator. am: 64c2559577 
Original change: https://android-review.googlesource.com/c/platform/build/+/2650296

Change-Id: I250e776c31413097c7c5438db36be890bcdd0881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 16:22:41 +00:00
Devin Moore
01e56d0ae0 Merge changes from topic "no_hidl_support" into main 
* changes:
  Add symlink to hwservicemanager
  Remove hwservicemanager and hidl allocator.
 2023-08-31 15:51:14 +00:00
Treehugger Robot
69c8926522 Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main am: c20ef7ca4a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2653761

Change-Id: I12468fb66e3c0915cbd92723c9206950b9721393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 15:31:37 +00:00
Treehugger Robot
c20ef7ca4a Merge "Avoid calling MergeUpdateEngineConfig for non-ab target" into main 2023-08-31 14:30:17 +00:00