StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,590 Commits 1 Branch 0 Tags
db3c1b173f42cd507bbc6d5b5f30a74aee1ddda4
Commit Graph

85590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jooyung Han
db3c1b173f Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: Ide054683665fe88e04f46f607b7408f1b7ccda01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 01:03:27 +00:00
Jooyung Han
5d7f9cb2a1 Merge "Remove TARGET_FLATTEN_APEX" into main 2023-08-28 00:32:35 +00:00
Treehugger Robot
a1c288f36a Merge "Reduce OTA tools's dependency on brillo_update_payload" into main am: fb4fb4b766 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726801

Change-Id: I589cfce6f21ba1bcd0c7c5566f336f85719d91b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 00:40:44 +00:00
Treehugger Robot
fb4fb4b766 Merge "Reduce OTA tools's dependency on brillo_update_payload" into main 2023-08-26 00:22:57 +00:00
Kelvin Zhang
f6fe0a9c9c Reduce OTA tools's dependency on brillo_update_payload 
brillo_update_payload is thin bash wrapper for delta_generator, and
OTA tools are wrappers around brillo_update_payload. This is
inconveinent, as adding a new flag requires changing 3 places. Since
brillo_update_payload is really thin, skip it and invoke delta_generator
directly.

Test: th
Bug: 293313353
Change-Id: I2fd5af95c571ea45aea62f9eec475f0f4e864953
 2023-08-25 13:49:09 -07:00
Treehugger Robot
d3cfff21f4 Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I57108c8b3aabfd4be81b4b986db6abd86e160ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 19:47:18 +00:00
Treehugger Robot
8c3bb5b993 Merge "Fix 16k ota package build failures on pixel" into main 2023-08-25 18:50:34 +00:00
Treehugger Robot
2a6a71476b Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254

Change-Id: Ifbb87b7a8740f076075ea3aa1b05fab5326015f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 18:22:51 +00:00
Treehugger Robot
510e0f2cbd Merge "Use platform built lz4 tool rather than system copy" into main 2023-08-25 17:48:13 +00:00
Kelvin Zhang
e9f4ce4368 Fix 16k ota package build failures on pixel 
boot_ota_16k.zip relies on build_boot_from_kernel_avb_enabled. But that
makefile function is guarded by $(BOARD_PREBUILT_BOOTIMAGE). Pixel
defined BOARD_PREBUILT_BOOTIMAGE, which causes
build_boot_from_kernel_avb_enabled to be undefined, resulting in build
failure.

Test: th
Bug: 293313353
Change-Id: I5b01e9bf7fedd9c508f476bc243d860dc48c5ebb
 2023-08-25 10:41:48 -07:00
Zhi Dou
68bf49c7c3 Merge "aconfig: add fixed read only flag" into main am: feac202f19 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720613

Change-Id: I1acf2c13e2684f5ba2d5b36dba94c8e7c9d46da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 14:15:31 +00:00
Zhi Dou
feac202f19 Merge "aconfig: add fixed read only flag" into main 2023-08-25 13:37:37 +00:00
Jooyung Han
0d500c58aa Remove TARGET_FLATTEN_APEX 
And inherit updatable_apex.mk by default.

Bug: 278826656
Test: presubmit
Change-Id: I3f93608a8750dcd72edc3f9517c70f3490f1a7cd
 2023-08-25 15:06:20 +09:00
Treehugger Robot
695570c064 Merge "Skip building compat files if REL" into main am: b531ccf36e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724973

Change-Id: I60db50f0f2bb3a09db3793447f5c08ce186df784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 04:45:29 +00:00
Treehugger Robot
b531ccf36e Merge "Skip building compat files if REL" into main 2023-08-25 04:29:28 +00:00
Inseob Kim
9b2631d11a Skip building compat files if REL 
In release build, we don't need to (and shouldn't) build compat files,
because it doesn't make sense to build compat files for itself.
Currently this didn't happen because REL build only happens on -dev
branches. To support main branch setting REL, filtering out
PLATFORM_SEPOLICY_VERSION from compat versions list.

Bug: 296780580
Test: build with next
Change-Id: Ia5c09a1c9b4209ed82dc66307d57decb4f442477
 2023-08-25 04:29:09 +00:00
Treehugger Robot
5929d7cd3e Merge "Fixes for python 3.11" into main am: c2e0a06152 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726795

Change-Id: Ifeff1e7d697daef1cc53a7d508d0e2d6386dcf08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 02:47:58 +00:00
Treehugger Robot
c2e0a06152 Merge "Fixes for python 3.11" into main 2023-08-25 02:14:35 +00:00
Kelvin Zhang
19c36a5ee7 Use platform built lz4 tool rather than system copy 
Test: th
Bug: 293313353
Change-Id: I22d5b6906dfd30f947eaa06d6196cdf560c50722
 2023-08-24 18:10:24 -07:00
Cole Faust
1f89cbb484 Fixes for python 3.11 
Bazel previously had a bug where the source directory of the entrypoint
python script would be added to the path. They added PYTHONSAFEPATH
to the enviornment to fix it, which was introduced in python 3.11.

Now that python is being updated to 3.11, the fix is in, which breaks
some scripts that don't properly specify import folders.

Add the import folders where required.

Bug: 278602456
Test: ./build/bazel/ci/bp2build.sh
Change-Id: I5b87f83247dfdfcb8bdb4f962466cbf522cc29c6
 2023-08-24 17:44:01 -07:00
Kalesh Singh
92865059e2 Merge changes I890db067,I4150dbd4 into main am: 78ecdf05c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2716397

Change-Id: Idc2db95b4103ee5d4c86ebc41c40d3b261c10849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 23:28:08 +00:00
Treehugger Robot
c7c9a58f1a Merge "Fix 16K page size kernel config check" into main am: f340bd9c13 
Original change: https://android-review.googlesource.com/c/platform/build/+/2725779

Change-Id: Ibbf56901bd431009ebddca3254e01787ebb7e827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 23:27:47 +00:00
Treehugger Robot
efe267a36e Merge "Add a 16K boot partition OTA target" into main am: f5fa306ea4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724253

Change-Id: I52a1c19da7b8a5a99c8ae1709c41e6688befb118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 23:27:15 +00:00
Kalesh Singh
78ecdf05c4 Merge changes I890db067,I4150dbd4 into main 
* changes:
  zipalign: Allow specifiying the target page size
  zipalign: Fix pageAlignSharedLibs arg in tests
 2023-08-24 22:59:42 +00:00
Treehugger Robot
f340bd9c13 Merge "Fix 16K page size kernel config check" into main 2023-08-24 22:58:56 +00:00
Treehugger Robot
f5fa306ea4 Merge "Add a 16K boot partition OTA target" into main 2023-08-24 22:38:23 +00:00
Kalesh Singh
55405b61be zipalign: Allow specifiying the target page size 
Allow apps to specify the target page size for aligning their
uncompressed shared libraries.

This allows apps that want to support larger page sizes to do
so by specifiying the -P <pagesize_kb> flag.

However, apps built for 4k-only devices are unaffected as they
can continue to use -p flag for 4kB page alignment of uncompressed
shared libraries.

Bug: 276963821
Test: atest -c zipalign_tests
Change-Id: I890db067b8f898045f73e86788662f94a48af772
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
 2023-08-24 14:46:13 -07:00
Kelvin Zhang
9113badc39 Fix 16K page size kernel config check 
Non 16K kernels might have "CONFIG_ARM64_16K_PAGES is not set" string in
kernel config, properly handle this case.

Test: th
Bug: 293313353
Change-Id: I1a9582503c5fd20b8dcf95406166df7e11940424
 2023-08-24 14:26:23 -07:00
Kelvin Zhang
6257eb2144 Add a 16K boot partition OTA target 
This OTA will be used to switch real devices to 16K kernel

Test: th
Bug: 293313353
Change-Id: I7a5866fd6f7f4ba6646af019386085ea2646c93f
 2023-08-24 13:44:59 -07:00
Zhi Dou
71f1b35fb4 aconfig: add fixed read only flag 
Add a new field in the declaration to indicate whether
the permission can be overridden.

When the field “is_fixed_read_only” is set to true,
the flag permission will be set as fixed “READ_ONLY”,
and the permission should not be changed by Gantry.

Bug: 292521627
Test: atest aconfig.test
Change-Id: Ic9bcd7823bccb8b947cf05568c7ced3763490a23
 2023-08-24 17:35:18 +00:00
Vincent Donnefort
3e8443e18e Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main am: 07c4b5c0f2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2724917

Change-Id: Id7bfcf472ca43e3d705a4ebbac21a703d4998e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 08:57:12 +00:00
Vincent Donnefort
07c4b5c0f2 Merge "Revert "Adds modern wallpaper pickers to AOSP installs"" into main 2023-08-24 08:11:04 +00:00
Woody Lin
371905638a Revert "Adds modern wallpaper pickers to AOSP installs" 
This reverts commit af76a98608.

Reason for revert: To fix regression test failure on 'WallpaperPickerGoogleTests'
Bug: 297301079

Change-Id: Id9eb21db31182c68551ef9e3c3d4d258879c541b
 2023-08-24 05:41:52 +00:00
Chris Poultney
6107268165 Merge "Adds modern wallpaper pickers to AOSP installs" into main am: 214c0e27e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722713

Change-Id: I130a11c65405de6b4d68ec98b86803c0bbcc48a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-24 03:04:36 +00:00
Chris Poultney
214c0e27e1 Merge "Adds modern wallpaper pickers to AOSP installs" into main 2023-08-24 02:21:24 +00:00
Kelvin Zhang
581ccd31e8 Merge "Add a tool to generate OTA from images" into main am: 593654a6ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722136

Change-Id: I0f2d14e667125ab201b34781ae967534dde6cb46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 19:54:09 +00:00
Kelvin Zhang
593654a6ab Merge "Add a tool to generate OTA from images" into main 2023-08-23 19:37:47 +00:00
Kelvin Zhang
c7441e5907 Add a tool to generate OTA from images 
During build, we will need to generate an OTA for boot partition using a
16K boot image. Typically, OTA is generated from target_files.zip . To
avoid relying on target_files.zip as a dependency for 16K OTA, add a
tool to generate OTA directly from a raw image.

Test: th, ota_from_raw_img --partition_name boot --output ota.zip $OUT/boot_16k.img
Bug: 293313353
Change-Id: I2076332faf2a8dc573450597efd481e285a49545
 2023-08-23 12:37:29 -07:00
Kangping Dong
13aaf50595 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main am: a169e4f7f6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2720033

Change-Id: Iaf484a217053498d4a09fbf1addb81c5122df3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 09:05:14 +00:00
Kangping Dong
4d5bafc752 Merge "Revert "add service-threadnetwork to system_server jars"" into main am: 2a8b64271d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2711774

Change-Id: Ib17f619164cac2edd4e82876b51033db3b596e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 09:05:10 +00:00
Kangping Dong
a169e4f7f6 Merge "Revert "add com.android.threadnetwork to base_system.mk"" into main 2023-08-23 08:37:38 +00:00
Kangping Dong
2a8b64271d Merge "Revert "add service-threadnetwork to system_server jars"" into main 2023-08-23 08:37:38 +00:00
Treehugger Robot
0d7abde2c0 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main am: a679e050f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722775

Change-Id: I4077056f6a63d150fc51dd38a94610cfcccb33c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 07:12:35 +00:00
Treehugger Robot
a679e050f5 Merge "Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN"" into main 2023-08-23 06:34:31 +00:00
Treehugger Robot
5403b178a8 Merge "Ignore vndk compat symlinks in artifact path requirements" into main am: 99dc0cc49e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2721721

Change-Id: I6432991fbba4be0e4f013478ac353452b94f26d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 05:56:36 +00:00
Treehugger Robot
99dc0cc49e Merge "Ignore vndk compat symlinks in artifact path requirements" into main 2023-08-23 05:24:48 +00:00
Chris Poultney
af76a98608 Adds modern wallpaper pickers to AOSP installs 
Bug: b/294871815
Change-Id: Id4c198f79a32b1b5a6a1a594cbb88f8df1623fe7
Test: built and flashed aosp device and launched ThemePicker
Test: ran all CTS tests per b/294871815#comment11 on aosp device with ThemePicker
 2023-08-23 02:53:00 +00:00
Inseob Kim
a26d098160 Revert "Add BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN" 
Revert submission 2715179-BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN

Reason for revert: not needed

Reverted changes: /q/submissionid:2715179-BUILD_BROKEN_VENDOR_SEAPP_USES_COREDOMAIN

Change-Id: Ib8612049314dbe26a913cc97b8c835fad4f03824
 2023-08-23 02:07:53 +00:00
Ronald Braunstein
94c845def4 Merge "Add adevice_fingerprint to eng builds." into main am: d7eeaba58f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2722456

Change-Id: Id0ea6a78ab180f059e5f8ce7151428a8371642b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-23 00:19:47 +00:00
Ronald Braunstein
d7eeaba58f Merge "Add adevice_fingerprint to eng builds." into main 2023-08-22 23:58:50 +00:00