StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,108 Commits 1 Branch 0 Tags
a2440a3e4a26447a080ca710042faf20a96b8db2
Commit Graph

98108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hsin-Yi Chen
a2440a3e4a Create APEX ABI dumps with next release configuration 
Next release configuration maps the codename to the finalized API
level, but fina_2 doesn't.

Ignore-AOSP-First: Finalization scripts are not on AOSP
Test: build/make/tools/finalization/finalize-sdk-rel.sh
Bug: 340507697
Change-Id: I00e55bf350ff5b5f5b10f9e74ceff38b0660dde3
 2024-05-15 08:32:27 +00:00
Treehugger Robot
9714526995 Merge "Remove build/make/METADATA which is not needed for the directory." into main am: 3e94ffd0ed am: f9231f984a 
Original change: https://android-review.googlesource.com/c/platform/build/+/3086691

Change-Id: I90a574ea330b99e8380750a3f0f188d9b8eb0cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-15 07:11:29 +00:00
Treehugger Robot
f9231f984a Merge "Remove build/make/METADATA which is not needed for the directory." into main am: 3e94ffd0ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/3086691

Change-Id: I68cff03f206b9dac62db26ef3ad407c11402612c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-15 06:54:24 +00:00
Treehugger Robot
3e94ffd0ed Merge "Remove build/make/METADATA which is not needed for the directory." into main 2024-05-15 06:26:04 +00:00
Wei Li
ef14fb257b Remove build/make/METADATA which is not needed for the directory. 
Bug: 340738699
Test: CIs
Change-Id: Ic32d4863e47be65b2821d94b941562c00246b6ad
 2024-05-14 22:19:18 -07:00
Joe Onorato
1bd5d747d6 Merge "Provide a function in envsetup.sh to get the host arch directly" into main 2024-05-14 22:31:28 +00:00
Treehugger Robot
8674bb045b Merge "Fix bug in device path proto reading" into main am: b63973dfc2 am: 21978761b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3085527

Change-Id: Ia8fd6c199b1394c41bf1cc76aaf8864fe6366318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-14 21:52:21 +00:00
Treehugger Robot
21978761b8 Merge "Fix bug in device path proto reading" into main am: b63973dfc2 
Original change: https://android-review.googlesource.com/c/platform/build/+/3085527

Change-Id: Iebf64e0055bc5d0f697dba038ac3635a2cfcb0c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-14 21:40:00 +00:00
Treehugger Robot
b63973dfc2 Merge "Fix bug in device path proto reading" into main 2024-05-14 21:01:21 +00:00
Joe Onorato
c3e104f97f Provide a function in envsetup.sh to get the host arch directly 
It's very simple logic, and running get_build_var to do it is slow
and has side effects (like needing a lunch target, creating an out
directory, etc.)

Test: source envsetup.sh
Change-Id: If260efd21713874fba7c15dbc0fd23442d776f8a
 2024-05-14 13:58:54 -07:00
Ted Bauer
1f9d55d2ab Fix bug in device path proto reading 
aconfig_device_paths uses `include_str!` to include a text file
containing comma-separated strings with each partition aconfig file.
The lib does not handle the escaped newlines and quotation marks.
Adds proper handling.

Test: cargo t  && m -j120 && acloud create --local-image && adb shell aflags list
Bug: 340514768
Change-Id: I75214bf02dd962d8291f1654ade8cbce1cda9fde
 2024-05-14 15:49:14 -04:00
Treehugger Robot
666f85d0bc Merge "Only consider EXTRA_INSTALL_ZIPS relevant by their primary file" into main am: a4b1e92ee0 am: 3a0ab9ac43 
Original change: https://android-review.googlesource.com/c/platform/build/+/3083666

Change-Id: I1ad807bf20344af7da7327b8ca8cb9cc3042230f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 23:39:54 +00:00
Treehugger Robot
3a0ab9ac43 Merge "Only consider EXTRA_INSTALL_ZIPS relevant by their primary file" into main am: a4b1e92ee0 
Original change: https://android-review.googlesource.com/c/platform/build/+/3083666

Change-Id: I343805800af09b237ce89c08b7dd44c37bcd30f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 23:18:00 +00:00
Treehugger Robot
a4b1e92ee0 Merge "Only consider EXTRA_INSTALL_ZIPS relevant by their primary file" into main 2024-05-13 22:56:46 +00:00
Dennis Shen
96dee8805b Merge "aconfig: simply proto" into main am: db0c8d7986 am: 91e478d07b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3081125

Change-Id: Ic9a84b5e3cd0e62b11a0e544cef6f9b3babc5c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 15:58:36 +00:00
Dennis Shen
91e478d07b Merge "aconfig: simply proto" into main am: db0c8d7986 
Original change: https://android-review.googlesource.com/c/platform/build/+/3081125

Change-Id: Ic426a1fbc7b67aab092d23db3e0f07cc6256eb4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 15:44:39 +00:00
Dennis Shen
db0c8d7986 Merge "aconfig: simply proto" into main 2024-05-13 15:26:26 +00:00
Treehugger Robot
c829858532 Merge "check-flagged-apis: handle nested flags" into main am: 7c71d88e0b am: e1802f1f2a 
Original change: https://android-review.googlesource.com/c/platform/build/+/3079003

Change-Id: Ie7f88d55f40c76e9028e1d848c30fc884738e179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 08:30:55 +00:00
Treehugger Robot
e1802f1f2a Merge "check-flagged-apis: handle nested flags" into main am: 7c71d88e0b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3079003

Change-Id: I132dd6e63ccd32f5acf28e335cf3326417e16936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 07:55:44 +00:00
Treehugger Robot
7c71d88e0b Merge "check-flagged-apis: handle nested flags" into main 2024-05-13 07:32:16 +00:00
Dennis Shen
a2fb60b822 aconfig: simply proto 
Bug: b/339514174, b/312444587
Test: atest -c
Change-Id: I5511efd04af9f57b22e4c89bd2db65496aaf4398
 2024-05-11 15:51:14 +00:00
Cole Faust
5cba391313 Only consider EXTRA_INSTALL_ZIPS relevant by their primary file 
Sometimes android_app_bundles exist in the tree but are not added
to PRODUCT_PACKAGES, in that case, they shouldn't be added to
file_list.txt.

We can tell if they're in PRODUCT_PACKAGES by if their primary file
is present in the list of files to install.

Bug: 337869220
Test: m out/target/product/emu64x/obj/PACKAGING/system_intermediates/file_list.txt and checking it for the extra NetworkStackGoogle apks, with a local NetworkStackGoogle android_app_set added into the tree
Change-Id: I22bcd9e972e1c9d5c7ddca788b9c6edc72f0a9dd
 2024-05-10 12:41:10 -07:00
Treehugger Robot
942eb2034e Merge "Replace impl ToString with impl Display" into main am: 8211cb24a5 am: d9f34e441d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3081923

Change-Id: I204c7156ef2eed664c414ac0a827feff17663c2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 19:20:32 +00:00
Treehugger Robot
d9f34e441d Merge "Replace impl ToString with impl Display" into main am: 8211cb24a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/3081923

Change-Id: I96c273b6fee771b49a16c049874a4e70437a3bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 19:00:47 +00:00
Treehugger Robot
8211cb24a5 Merge "Replace impl ToString with impl Display" into main 2024-05-10 18:32:41 +00:00
Treehugger Robot
7f7bd04f0a Merge "Move sysprop assignments to separate mk file" into main am: db3606ddd8 am: a6a2aa2cbb 
Original change: https://android-review.googlesource.com/c/platform/build/+/3078603

Change-Id: Ib177d996450fac1326d7a0a0b0a005bfde19e847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 02:05:37 +00:00
Treehugger Robot
a6a2aa2cbb Merge "Move sysprop assignments to separate mk file" into main am: db3606ddd8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3078603

Change-Id: I0a3d65164a1cf7bc147ffca107af7ae57b4fefb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 01:46:57 +00:00
LaMont Jones
ee570a3f36 [automerger skipped] Avoid re-running kati unnecessarily. am: 65c8dbb781 -s ours 
am skip reason: Merged-In I0447a127aee7e5ef34d7ae81a3b8bead7c7bc95b with SHA-1 3f0eba2bdc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27287957

Change-Id: I973418bb15096e3599b8124830791ed3726c894c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 01:39:43 +00:00
Treehugger Robot
db3606ddd8 Merge "Move sysprop assignments to separate mk file" into main 2024-05-10 01:26:40 +00:00
Cole Faust
727c22854b Merge "Record contents of EXTRA_INSTALL_ZIPS files in file_list.txt" into main am: 441d1db5f9 am: 4a86ef7d6f 
Original change: https://android-review.googlesource.com/c/platform/build/+/3080639

Change-Id: Iead57efe2bb16d54b96f4f0ee03c63a6fdbf325a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 00:51:14 +00:00
Cole Faust
4a86ef7d6f Merge "Record contents of EXTRA_INSTALL_ZIPS files in file_list.txt" into main am: 441d1db5f9 
Original change: https://android-review.googlesource.com/c/platform/build/+/3080639

Change-Id: Ife72d09af8ad9d080911e7ccbf7e24a3c3a16c56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 00:31:56 +00:00
Treehugger Robot
a27b43603e Merge "Avoid re-running kati unnecessarily." into main am: 00732c7981 am: 491e260cc2 
Original change: https://android-review.googlesource.com/c/platform/build/+/3081924

Change-Id: Ic83dff4487cfe545a5063c68318399760792c3dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 00:25:07 +00:00
Cole Faust
441d1db5f9 Merge "Record contents of EXTRA_INSTALL_ZIPS files in file_list.txt" into main 2024-05-10 00:11:16 +00:00
Treehugger Robot
491e260cc2 Merge "Avoid re-running kati unnecessarily." into main am: 00732c7981 
Original change: https://android-review.googlesource.com/c/platform/build/+/3081924

Change-Id: Ia511ede0e0e795c78b4e2e3e67a383e4b91413cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 00:01:54 +00:00
LaMont Jones
65c8dbb781 Avoid re-running kati unnecessarily. 
Bug: 339707888
Test: manual
Ignore-AOSP-First: cherry-pick
Merged-In: I0447a127aee7e5ef34d7ae81a3b8bead7c7bc95b
Change-Id: I0447a127aee7e5ef34d7ae81a3b8bead7c7bc95b
 2024-05-09 23:59:13 +00:00
Treehugger Robot
00732c7981 Merge "Avoid re-running kati unnecessarily." into main 2024-05-09 23:38:41 +00:00
LaMont Jones
3f0eba2bdc Avoid re-running kati unnecessarily. 
Bug: 339707888
Test: manual
Change-Id: I0447a127aee7e5ef34d7ae81a3b8bead7c7bc95b
 2024-05-09 15:33:01 -07:00
Chris Wailes
e6bb2e951d Replace impl ToString with impl Display 
If the Display interface is implemented the compiler will automatically
derive an implementation of ToString.

Test: m aflags
Bug: 333887339
Change-Id: I861a3065edbef0da1684a6ea28cc374acd0d774a
 2024-05-09 15:14:22 -07:00
Dennis Shen
ff38350139 Merge "aconfig: add list_flag api cxx interlop" into main am: 9d21525b85 am: 341557f56c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3079587

Change-Id: If731976287515a794e6867dd0823c35d884a72fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-09 21:52:22 +00:00
Dennis Shen
341557f56c Merge "aconfig: add list_flag api cxx interlop" into main am: 9d21525b85 
Original change: https://android-review.googlesource.com/c/platform/build/+/3079587

Change-Id: Iaf5a2975c1aa18285d83ec030f7a96bb97a890be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-09 21:31:37 +00:00
Dennis Shen
9d21525b85 Merge "aconfig: add list_flag api cxx interlop" into main 2024-05-09 21:13:17 +00:00
Cole Faust
9feef379ff Record contents of EXTRA_INSTALL_ZIPS files in file_list.txt 
The partitions will not include anything that's not in file_list.txt.

Zip files in EXTRA_INSTALL_ZIPS are extracted into the staging
directories when other files are installed. Their contents need to
be added to the file_list.txt so that their extracted files are not
ignored.

EXTRA_INSTALL_ZIPS is only used by android_app_set, which is only used
by partners, so this bug went unnoticed for a long time.

Bug: 337869220
Test: m droid and checked the contents of file_list.txt when adding an android_app_set locally
Change-Id: Ifa2f7168dbeedbb2308a481c0c78f28e874b0aef
 2024-05-09 11:04:23 -07:00
Treehugger Robot
9168dbb0be Merge "Reland "Fix retrofit OTA generation failures"" into main am: 67c90ed1e9 am: 197f41f23d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3080633

Change-Id: I4d534c0b20e170cf138271b0d46317ea3fd0253c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-09 17:56:33 +00:00
Treehugger Robot
918c547c85 Merge "Exclude mcts tests from cts based on the env config" into main am: 5e32d41441 am: 3164582b6b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3081046

Change-Id: Iccd1a0c50195218d303999cd9195aa0c349a3ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-09 17:56:06 +00:00
Dennis Shen
e1949a6563 aconfig: add list_flag api cxx interlop 
Bug: 312444587
Test: atest -c
Change-Id: I3e3bc511c370fbcdfa6dcf7942377dd9b544c647
 2024-05-09 17:37:36 +00:00
Treehugger Robot
197f41f23d Merge "Reland "Fix retrofit OTA generation failures"" into main am: 67c90ed1e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/3080633

Change-Id: Ida7f1fdec8feee4d400411f31bc9aab7cb45642e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-09 17:34:49 +00:00
Treehugger Robot
3164582b6b Merge "Exclude mcts tests from cts based on the env config" into main am: 5e32d41441 
Original change: https://android-review.googlesource.com/c/platform/build/+/3081046

Change-Id: I2efc05396ceb3b7c732072d99f1089be2a23f226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-09 17:32:16 +00:00
Treehugger Robot
67c90ed1e9 Merge "Reland "Fix retrofit OTA generation failures"" into main 2024-05-09 16:54:09 +00:00
Treehugger Robot
5e32d41441 Merge "Exclude mcts tests from cts based on the env config" into main 2024-05-09 16:37:28 +00:00
Treehugger Robot
91c40ed17d Merge "Add a Java lib to read on-device proto paths" into main am: c0c2e5f278 am: 39937913e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/3077343

Change-Id: I53fc186f8a27071ebce6eafeb38f1660dcb67446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-09 15:52:28 +00:00