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
Android Build Coastguard Worker
8671e20201 [coastguard skipped] Merge sparse cherrypicks from sparse-10529556-L00000000962081650 into udc-release. 
COASTGUARD_SKIP: I1a5d6af1c5dd1881ab36e45590f4c7fa98f8449d

Change-Id: I647601bbb44bc0ea614415f53043753d630a0ad6
 2023-07-20 04:10:22 +00:00
Android Build Coastguard Worker
1a2b6b6354 Version bump to UP1A.230905.004.X1 [core/build_id.mk] 
Change-Id: I1a5d6af1c5dd1881ab36e45590f4c7fa98f8449d
 2023-07-20 04:06:27 +00:00
Zhi Dou
92cf0ec232 Aconfig: sort the parsed flag order in create-cache 
This change will sorted the parsed flags from the declarations. Without
this change the code will expect the passed in declarations sorted.
After this change the code will still guarantee the parsed flags in the
cache is sorted, but it won't expect the passed in declarations are
sorted

Test: atest aconfig.test
Bug: 291926035
Change-Id: I5f0637fe770003224b128591890e04277bc09345
 2023-07-20 02:32:00 +00:00
Android Build Coastguard Worker
17fe9b13a5 Version bump to UP1A.230905.004 [core/build_id.mk] 
Change-Id: I7894f3d15c673f2476f93c51dd736324bdbb7cf7
 2023-07-20 01:32:21 +00:00
Android Build Coastguard Worker
f1c2e12bfa [coastguard skipped] Merge sparse cherrypicks from sparse-10502572-L96100000962079528 into udc-release. 
COASTGUARD_SKIP: I51c9935eff6479a3e013a4c57e7015bfd5065118
COASTGUARD_SKIP: I7da89f8389c09cc99201cff342483c158bd7e9c1
COASTGUARD_SKIP: Ief86b55c1d4a14220a0fb593c583a721d59cf86c
COASTGUARD_SKIP: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481
COASTGUARD_SKIP: I9c1a5346e3a5f3920242dc9a5268d999f50a4937

Change-Id: I561a28131351e58c42659899fb95ebdb2fb813a7
 2023-07-20 00:02:21 +00:00
Android Build Coastguard Worker
da3c9330ac Make change and version bump to UP1A.230623.016.X1 
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23709440', 'googleplex-android-review.googlesource.com/23712489', 'googleplex-android-review.googlesource.com/24102492', 'googleplex-android-review.googlesource.com/24104319'] into sparse-10502572-L96100000962079528.
SPARSE_CHANGE: Ief86b55c1d4a14220a0fb593c583a721d59cf86c
SPARSE_CHANGE: I9c1a5346e3a5f3920242dc9a5268d999f50a4937
SPARSE_CHANGE: I7da89f8389c09cc99201cff342483c158bd7e9c1
SPARSE_CHANGE: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481

Change-Id: I51c9935eff6479a3e013a4c57e7015bfd5065118
 2023-07-19 23:58:47 +00:00
Kelvin Zhang
48b23028a4 Handle symlinks when extracting zipfiles 
python3.11's zipfile implementation does not handle symlinks. This
causes important symlinks in ramdisk to be broken, and later causing a
boo failure.

Test: unzip a target files with symlinks, make sure symlinks are created
Bug: 287896098
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2b2de0375faf9e23094f6238c38f9a49906b1882)
Merged-In: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481
Change-Id: Ia7d6ac8ffb03807680a36ff648aa11afafb7f481
 2023-07-19 23:58:30 +00:00
Kelvin Zhang
f604d01ba4 Handle zip64 extra fields better 
Test: check_target_files_signatures
Bug: 283033491
(cherry picked from https://android-review.googlesource.com/q/commit:1e774245a4dd2763545827d65462e5c115eecb63)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e66c973a36339484e8fa59c37c9005badca62a5d)
Merged-In: I7da89f8389c09cc99201cff342483c158bd7e9c1
Change-Id: I7da89f8389c09cc99201cff342483c158bd7e9c1
 2023-07-19 23:58:22 +00:00
Kelvin Zhang
1836ac3ff7 Fix python3.11's support for zip64 
Bug: 283033491
Test: check_target_files_signatures -v -l
(cherry picked from https://android-review.googlesource.com/q/commit:38d0c373ac9e0f00c6e677c41bbc85f0e364ba02)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3c739f18475a9d31be299f3016dddc6a5ac02e16)
Merged-In: I9c1a5346e3a5f3920242dc9a5268d999f50a4937
Change-Id: I9c1a5346e3a5f3920242dc9a5268d999f50a4937
 2023-07-19 23:58:14 +00:00
Kelvin Zhang
e95f57f9bd Use python based unzip function for portability 
Bug: 283033491
Test: th
(cherry picked from https://android-review.googlesource.com/q/commit:7c9205b008002c41880241e866ad4b5438112439)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0bf992ee0595727b4a2c563fd5023287727dd8b3)
Merged-In: Ief86b55c1d4a14220a0fb593c583a721d59cf86c
Change-Id: Ief86b55c1d4a14220a0fb593c583a721d59cf86c
 2023-07-19 23:58:07 +00:00
Daniel Zheng
2ad23ca508 Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559f9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2646274

Change-Id: Icaf55a978175f82f98684ee929a2153e9cc8e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 16:39:24 +00:00
Daniel Zheng
0ee11559f9 Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main 2023-07-19 15:57:45 +00:00
Kangping Dong
a3ecbf45ff Merge "add service-threadnetwork to system_server jars" into main am: 693afdca74 
Original change: https://android-review.googlesource.com/c/platform/build/+/2651500

Change-Id: I249d75a2d80526800a56c3198fc3cdb952c7d836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 10:23:01 +00:00
Kangping Dong
693afdca74 Merge "add service-threadnetwork to system_server jars" into main 2023-07-19 09:40:46 +00:00
Treehugger Robot
87f21f19f6 Merge "Add a new variable for deprecating VNDK" into main am: 3ca44b286e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2648185

Change-Id: I65c40754728abf4dd91dfe0cb530011c4944dde7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 05:30:53 +00:00
Timothy Yiu
5cd4465e5b Merge "Conditionally remove DSU for wearable targets" into main am: e97b271350 
Original change: https://android-review.googlesource.com/c/platform/build/+/2657595

Change-Id: I714c74bda7b0e13313873a5b76332d11e42e4cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-19 05:30:21 +00:00
Treehugger Robot
3ca44b286e Merge "Add a new variable for deprecating VNDK" into main 2023-07-19 04:44:51 +00:00
Timothy Yiu
e97b271350 Merge "Conditionally remove DSU for wearable targets" into main 2023-07-19 04:04:21 +00:00
Android Build Coastguard Worker
a7f1918bab Version bump to UP1A.230905.003 [core/build_id.mk] 
Change-Id: I01169b486a70352bfe9b2c0aa7c09003c33967f9
 2023-07-19 03:06:46 +00:00
tyiu
741227c432 Conditionally remove DSU for wearable targets 
Bug: 289629075
Test: m + Treehugger
Change-Id: Idcf862ee728d81b37ee6a37eb4001969102e250f
 2023-07-18 23:59:13 +00:00
Dennis Shen
83ec2fc8a6 Merge "aconfig: Rust codegen 2nd iteration" into main am: dca368be45 
Original change: https://android-review.googlesource.com/c/platform/build/+/2660115

Change-Id: Ie15bab903a5bf94d0dc4354a163fd325a3b7030f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-18 21:05:45 +00:00
Dennis Shen
dca368be45 Merge "aconfig: Rust codegen 2nd iteration" into main 2023-07-18 20:14:51 +00:00
Dennis Shen
3cfbcf5384 aconfig: Rust codegen 2nd iteration 
Introduce rust codegen 2nd iteration with unit test support. The design
is described in detail in the design doc (go/aconfig_rust_codegen). The general idea is to generate
different code with the same signature for production and test build
targets, just like java/c/cpp codegen.

We will have a FlagProvider struct that has flag methods implementation.
This flag provider instance can then be used in injection pattern. In
additon, we also generate top level functions that wraps around flag
provider call so it can be used in static function style.

Things to be decided later:

should we just generate one set of code, and use cfg! as compile
time marco to compile the right code for the right targets.

Bug: b/279483360
Test: atest aconfig.test
Change-Id: Ic75cedbd0d27b5242014c3ac7fc80692d2ab4589
 2023-07-18 20:14:46 +00:00
Android Build Coastguard Worker
8018ab997b [coastguard skipped] Merge sparse cherrypicks from sparse-10502572-L39700000962039696 into udc-release. 
COASTGUARD_SKIP: I2e4890242974c810f51f48f05af64c0c23daa4f6

Change-Id: I4c9e412da30f11bc2797b9c7cfab1019fde9f585
 2023-07-18 16:58:22 +00:00
Android Build Coastguard Worker
794763da6b Version bump to UP1A.230623.016.A1 [core/build_id.mk] 
Change-Id: I2e4890242974c810f51f48f05af64c0c23daa4f6
 2023-07-18 16:50:14 +00:00
Android Build Coastguard Worker
f07eaab69c Version bump to UP1A.230905.002 [core/build_id.mk] 
Change-Id: I6ff9dac59acc9b90cc7692baa2a4a9f7467e7303
 2023-07-18 09:04:28 +00:00
Android Build Coastguard Worker
973dbd2b31 Make change and version bump to UP1A.230905.001 
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24026314'] into udc-release.

Change-Id: Id8d1a4af95ea84a7c0747780903e8e270f62f5e6
 2023-07-18 04:36:24 +00:00
Bassem Khalife
6741c842cf Update Security String to 2023-09-05 
Bug: 289414927
Ignore-AOSP-First: Future release prep (Internal first)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:838fbc4dd7190468ad68b92e3cb7b56fe7f3625f)
Merged-In: Ia5208702fc02d0e1ab53d1affc664363fba74a67
Change-Id: Ia5208702fc02d0e1ab53d1affc664363fba74a67
 2023-07-18 04:29:52 +00:00
Dennis Shen
4222b4f0b5 Merge "Minor c/c++ codegen update" into main am: 01332169f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2657598

Change-Id: I7d79f143da3840469d5cafda5aa1b33cbb487529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 13:29:00 +00:00
Dennis Shen
01332169f3 Merge "Minor c/c++ codegen update" into main 2023-07-17 12:58:23 +00:00
Sebastian Pickl
cda6860015 Merge "Revert "Minify the sdk targets"" into main am: 21c04ea58c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2658380

Change-Id: I6ad3419a4e9e43ba8774de4a436842ca475e0dd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 10:48:05 +00:00
Sebastian Pickl
21c04ea58c Merge "Revert "Minify the sdk targets"" into main 2023-07-17 10:11:57 +00:00
Menghan Li
bda69f5991 Revert "Minify the sdk targets" 
This reverts commit 7a114c5313.

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/291353860 verified with go/abtd https://android-build.googleplex.com/builds/abtd/run/L17500000961999253 by menghanli@

Change-Id: Iaaf37f780e71ef6f0eb745b3c06c1c5f47a8e03b
Bug: 291353860
 2023-07-17 10:05:27 +00:00
Treehugger Robot
ddd017226a Merge "Disable copying images for target_files.zip" into main am: f1f3e38b64 
Original change: https://android-review.googlesource.com/c/platform/build/+/2658156

Change-Id: I39391decb1dfa02255847222facfce46d2edf798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 00:18:05 +00:00
Treehugger Robot
f1f3e38b64 Merge "Disable copying images for target_files.zip" into main 2023-07-16 23:44:25 +00:00
Justin Yun
22ce9479be Disable copying images for target_files.zip 
For the OTA build, target_files.zip requires setting fixed timestamp
for images. However, it caused regression on 'adb sync'.
Restoring image build process for target_files.zip instead of copying
them from the PRODUCT_OUT, only the images in target_files.zip set the
fixed timestamp.
By setting COPY_IMAGES_FOR_TARGET_FILES_ZIP flag, we still may copy
the images for target_files.zip for future use.

Bug: 287534409
Test: m; flashall; adb sync
Test: m dist; flash images from target_files.zip and check the timestamp
Change-Id: I4135eb721c33581f191621847e6595833263d707
 2023-07-17 07:46:48 +09:00
Android Build Coastguard Worker
7979d36639 Version bump to UP1A.230623.016 [core/build_id.mk] 
Change-Id: Ia89244a488373d7835b5d50a3919f82a7a39fce8
 2023-07-15 07:08:51 +00:00
Android Build Coastguard Worker
3bbdd0f024 [coastguard skipped] Merge sparse cherrypicks from sparse-10415351-L71400000961983299 into udc-release. 
COASTGUARD_SKIP: I5701a96daeea414c6eb38c5ad8c4a49de31709c6

Change-Id: I1ebc6fac4a662c1c504741d25afa88c4f35d8031
 2023-07-14 22:40:00 +00:00
Android Build Coastguard Worker
4df44ab768 Version bump to UP1A.230623.006.A1 [core/build_id.mk] 
Change-Id: I5701a96daeea414c6eb38c5ad8c4a49de31709c6
 2023-07-14 22:36:54 +00:00
Cole Faust
fbabd71b48 Merge "Minify the sdk targets" into main am: 7137d5d46f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2656958

Change-Id: I239c4c0d976c41cc194b006528a5e80292ef17b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 21:52:43 +00:00
Joe Onorato
89f17ef427 Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL 
Bug: 282843732
Test: get_build_var PLATFORM_VERSION_CODENAME
Change-Id: I16b9cf4ec8f395ceb192e35c18850fdab0a47df3
 2023-07-14 14:18:08 -07:00
Cole Faust
7137d5d46f Merge "Minify the sdk targets" into main 2023-07-14 20:42:18 +00:00
Dennis Shen
5c2421394c Minor c/c++ codegen update 
1, Moved "#include <string>" from exported header to test flag provider
header file.

2, For production target and read only flags, the generated c
api should just return default value instead of calling into c++ api

3, Remove using namespace server_configurable_flags from header, instead
of just having the namespace to be spelled out in each api call. Having
using namespace xxx in header is not a c++ best practice.

4, Replace #ifdef #def #endif with #pragma once

Bug: b/279483801
Test: atest aconfig.test
Change-Id: I3e55a7b14301f3de419795467f33e2dc889d371e
 2023-07-14 16:09:35 +00:00
Dennis Shen
13f12e639a Merge "aconfig: update c/c++ codegen" into main am: 21380611d4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2657839

Change-Id: Ic410d4f2371557646267026fbedeb48248e3a056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 14:17:08 +00:00
Dennis Shen
21380611d4 Merge "aconfig: update c/c++ codegen" into main 2023-07-14 13:37:01 +00:00
Jiakai Zhang
735385ff9f Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main am: f2cc1324c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2655206

Change-Id: Iabcbe7aabbd4522dccad833ed5c059a037617b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 12:26:03 +00:00
Jiakai Zhang
de5df72bcd Add core-icu4j and consrypt to the ART boot image for testing. 
Bug: 290583827
Test: art/tools/buildbot-build.sh --host
Test: m test-art-host-gtest
Test: m build-art-target-golem
Test: m build-art-host-golem
Change-Id: I8d0069b51484deb193350332ff911a89f2c4ee56
 2023-07-14 12:48:38 +01:00
Jiakai Zhang
f2cc1324c1 Merge changes from topics "art-boot-image-jars", "configured-jar-location-overrides" into main 
* changes:
  Add a Make variable to determine ART boot image jars for testing.
  Add a Make variable that overrides configured jar locations.
 2023-07-14 11:47:59 +00:00
Dennis Shen
17a08eeca0 aconfig: update c/c++ codegen 
Two major changes to c/c++ codegen

(1) explicit setter for each flag instead of a generic flag setter
void override_flag(std::string name, bool val) is replaced with

void <flag name>(bool val) for each flag name

This has several advantages:
  (a) generated code is more c++ idomatic
  (b) no longer need to create flag name string constants
  (c) any typo in the code is caught early in the build time

(2) remove flag setter and flag override reset methods/functions when
generating code targets for production. If developers want to update
their main function to take command line arg for flag overrides, they
can use compile time macros to decide if the flag override code should
be included.

Bug: b/279483801
Test: atest aconfig.test
Change-Id: I6141f7f979b32fe0426154d578edeb997ae5ff7c
 2023-07-14 11:40:49 +00:00
Shaju Mathew
8e8c79801d Merge "Use command instead of which to locate/run adb" into main am: 9c777ce8a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2656957

Change-Id: I7231e33714ad281ad0decfcd6201bd6cd413255f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 03:14:51 +00:00