Commit graph

82905 commits

Author SHA1 Message Date
Treehugger Robot
54c5f0d0df Merge "Allow build_image.py to build vbmeta partition" 2022-12-21 20:38:49 +00:00
Chih-Hung Hsieh
442e08ffa7 Fix uninitialized value warnings.
Bug: 263274255
Test: presubmit; make tidy-build-make_subset
Change-Id: Ib6ce849596312f56e8d640c5f78e0e70f7ca54e3
2022-12-20 16:51:53 -08:00
Kelvin Zhang
37bc304a3d Allow build_image.py to build vbmeta partition
Cuttlefish needs to rebuild vbmeta at runtime, instead of duplicating
logic in cuttlefish tooling, re-use these logic in release tools.

Test: build_image $OUT misc_info.txt /tmp/vbmeta.img /tmp/otatols
Bug: 149866755
Change-Id: I2050f9e2dd7eed9b81a49a8442ec199147041d20
2022-12-20 10:59:58 -08:00
Zhi Dou
46ea5dc99a Add condition check of KEEP_APEX_INHERIT
Add environment variable KEEP_APEX_INHERIT condition check to set the
proper value of Soong conditional variable library_linking_strategy. If
the KEEP_APEX_INHERIT exists, the "min_sdk_version" in condition will be
set to "apex_inherit". For more detail:
https://docs.google.com/document/d/1R2vZw0cQa-haAMgFyQ682uSq9aGBNQrzMHKIsU17-XY/edit?usp=sharing&resourcekey=0-gUbs463r9LCKs7vdP_Xkmg

Test: build module locally, and check the corresponding change.
Presbumit
Bug: 254634795

Change-Id: I0ddc999a19d9f164477d69be0e4aebc91e06a3ad
Merged-In: Ic5da1c83b3b9c090bc2a24d36b1a4ac936ce1a59
2022-12-20 16:06:20 +00:00
Nick Chameyev
839620e38c Merge "Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt" 2022-12-20 15:02:27 +00:00
Jooyung Han
0561be3c26 Merge "checkvintf --check-one with APEXes" 2022-12-20 14:44:29 +00:00
Nick Chameyev
3bb4b5d759 Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt
Updates hardcoded /system path to use
the qualifier before colon to support
/system_ext paths in dex_preopt.mk.

Bug: 155630745
Test: m dist droid with a system server
  library on a system_ext partition

Change-Id: I4dccc1f55bd2cafa13d57b46f122c44f66da335b
2022-12-19 16:27:04 +00:00
Jiyong Park
ad4df54d6c Merge "Place unstripped pvmfw image to the symbols directory" 2022-12-19 02:33:23 +00:00
Treehugger Robot
ded89ff976 Merge "Remove dalvik.vm.usejitprofiles system property." 2022-12-16 18:51:08 +00:00
Kun Niu
40e6f9bdca Set UNBUNDLED_BUILD_SDKS_FROM_SOURCE to true by default in
module_common.mk if the branch is not using slim manifests.
This makes sure that mainline modules build locally are
using the build from source sdk.

Bug: 262783668
Test: time m atest && time atest-dev CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex] --verbose
Change-Id: I37b94448a45b0b811ae1815ad8c46589c62e8542
2022-12-16 10:48:49 -08:00
Jooyung Han
c9cc48b412 checkvintf --check-one with APEXes
checkvintf --check-one is to check the consistency of VINTF data in a
single partition. To read VINTF from /vendor partition, it should read
/apex as well to gather VINTF from vendor apexes.

Bug: 262189711
Test: m check-vintf-all
Change-Id: I70b194f4dae47ca6080dcdfb3baa69ac7da9b653
2022-12-16 16:12:29 +09:00
Jiyong Park
e219f0068a Place unstripped pvmfw image to the symbols directory
Bug: 245896220
Test: examine the symbols.zip file on aosp_cheetah
Change-Id: I8730baa64e6ff16fcdf765dc8878771d2ec16be8
2022-12-16 14:30:03 +09:00
Treehugger Robot
b1cf7a7e66 Merge "Remove linkerconfig from base_system" 2022-12-14 07:16:12 +00:00
Treehugger Robot
d6184bc4c2 Merge "Add arch variants for Intel Atom CPUs" 2022-12-14 03:32:13 +00:00
Treehugger Robot
8998fd723e Merge "Make clear_var_list set nonexistant variables to empty strings" 2022-12-14 00:20:36 +00:00
Cole Faust
44de6d8f7a Make clear_var_list set nonexistant variables to empty strings
Make's clear-var-list causes the variables to exist as empty strings.
Mimic that functionality in starlark for the variable diff and ?=.

Bug: 262303006
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I5f9c8cf342d875b1022c5c74906e59fa68fcd6c9
2022-12-13 13:02:10 -08:00
Greg Kaiser
14b12d9e31 Merge "Add rbc implementation of clear_var_list" 2022-12-13 20:50:00 +00:00
Cole Faust
8397c8efee Add rbc implementation of clear_var_list
Bug: 262303006
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ib5d7d37a7d7fa40ec990d9506fe0bef7da5b5bcd
2022-12-13 10:17:16 -08:00
Jooyung Han
be6f3a146d Remove linkerconfig from base_system
Linkerconfig is served by com.android.runtime APEX which is already
listed in base_system (via runtime_libart.mk).

Bug: 260982509
Bug: 262330207
Test: MicrodroidAppTest
Test: vm run-microdroid
Change-Id: I2451526cb42be1ad60dcec3ae477fad2b9df9f83
2022-12-13 18:21:56 +09:00
Treehugger Robot
2dcc38701b Merge "Finalize resources before updating API." 2022-12-11 07:05:43 +00:00
Alex Buynytskyy
b0adb5ad41 Finalize resources before updating API.
Bug: 243966946
Test: run locally
Change-Id: Ie4b14b191b10f4a473da1b5ca3d9622d1f90a3f7
2022-12-11 03:21:29 +00:00
Xin Li
7701612421 Merge "Merge Android 13 QPR1" 2022-12-09 21:51:24 +00:00
Xin Li
3cdf392f61 Merge Android 13 QPR1
Bug: 261731544
Merged-In: Idccbf36672703b1e9a6b27bf117459284bc7ed26
Change-Id: I3c0651138a35d0ec3289be1b0e6873bba57593b4
2022-12-09 10:23:02 -08:00
Treehugger Robot
e4c493a3ad Merge "Correct paths for abi prebuilts." 2022-12-09 17:46:23 +00:00
Steven Moreland
e1287ba004 Merge "graphics.common V3 -> V4" 2022-12-09 17:21:59 +00:00
Alex Buynytskyy
6028dacd79 Correct paths for abi prebuilts.
Bug: 260755259
Test: run locally
Change-Id: If1d1d2abbcad9db7ab48782d809b3c160f656afd
2022-12-09 04:05:32 +00:00
Treehugger Robot
4a134c38b2 Merge "Almost fully automated finalization." am: 77f1215378
Original change: https://android-review.googlesource.com/c/platform/build/+/2333787

Change-Id: Ia94989f5453627e2e824f6f78a8b4bdab59bf7f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 06:20:05 +00:00
Treehugger Robot
77f1215378 Merge "Almost fully automated finalization." 2022-12-08 05:52:02 +00:00
Alex Buynytskyy
de37a0e7d6 Almost fully automated finalization.
Bug: 243966946
Bug: 260755259
Test: run locally
Change-Id: Idccbf36672703b1e9a6b27bf117459284bc7ed26
2022-12-08 01:39:41 +00:00
Treehugger Robot
9c3e22139d Merge "Default to not generating modules.dep for system side" am: 8a9dffb96e
Original change: https://android-review.googlesource.com/c/platform/build/+/2332648

Change-Id: I13f75e085be2526441c53f8df2e200a29991c36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 01:25:51 +00:00
Treehugger Robot
51b57bb21e Merge "multitree_lunch: remove extraneous call" am: afa0688aa4
Original change: https://android-review.googlesource.com/c/platform/build/+/2333784

Change-Id: Iaae448df69fd744982ab879db24ade432e591034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 01:25:26 +00:00
Treehugger Robot
8a9dffb96e Merge "Default to not generating modules.dep for system side" 2022-12-08 01:03:07 +00:00
Treehugger Robot
afa0688aa4 Merge "multitree_lunch: remove extraneous call" 2022-12-08 01:01:48 +00:00
Treehugger Robot
d5643f14d2 Merge "Latest finalization scripts." am: 3db8f0a65d
Original change: https://android-review.googlesource.com/c/platform/build/+/2332649

Change-Id: I5e87a5f2736a6627b99ae65e5b75c8731ddec6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 22:26:12 +00:00
Treehugger Robot
3db8f0a65d Merge "Latest finalization scripts." 2022-12-07 22:00:29 +00:00
LaMont Jones
51670eb263 multitree_lunch: remove extraneous call
If the shell is set to exit on errors, the extraneous (incorrect syntax)
call to lunch.py causes an early exit.

Change-Id: I0176d5c9e7e42640514fd4988d82fbfdd825631d
2022-12-07 21:55:58 +00:00
Alex Buynytskyy
13c8267aaa Latest finalization scripts.
Bug: 243966946
Bug: 260755259
Test: run locally
Change-Id: I33a841bd83c20b31af604ea014cced38429da0f5
2022-12-07 18:54:51 +00:00
Kelvin Zhang
395d3df406 Default to not generating modules.dep for system side
Test: th
Bug: 149866755
Change-Id: I36c26bed46f43ca8ff7d4afdaf3ee1d7e1c70c3f
2022-12-07 10:36:10 -08:00
Marc Kassis
1b308a4002 graphics.common V3 -> V4
Bug: 251177105
Test: m
Change-Id: I0d03ff56140843cfec9e6f37672a8b3f8e298c2a
Merged-In: I5ed6fbaf18aa1568f3bebf5f46ab31484d386598
2022-12-07 08:34:29 +00:00
Treehugger Robot
4e983209c7 Merge "Fix typo in cross partition dependency generation" am: 3de79b1806
Original change: https://android-review.googlesource.com/c/platform/build/+/2329889

Change-Id: I81655d0dc7410e2e0ecc44bdb7ad7f353f475b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07 04:26:47 +00:00
Treehugger Robot
3de79b1806 Merge "Fix typo in cross partition dependency generation" 2022-12-07 03:33:42 +00:00
Kelvin Zhang
21b6cade74 Fix typo in cross partition dependency generation
intention was to symlink modules in vendor_dlkm to system_dlkm. Typo
caused the same modules to link itself.

Test: build, make sure vendor_dlkm's modules.dep contains system
dependency

Change-Id: I19664cd9a8578566d3a038885b8ce27556801a79
2022-12-06 16:31:02 -08:00
Martin Stjernholm
4a75e406ed Remove dalvik.vm.usejitprofiles system property.
Disabling profiles is no longer supported. Most of the profile support
has been active even when this property was false, and it won't be
supported in the ART Service.

(cherry-picked from commit 7bf4c34e29)

Test: Boot
Bug: 254434433
Merged-In: I1a77f006f204cd2f1fb302bcf4b1126f54e2e78b
Change-Id: I1a77f006f204cd2f1fb302bcf4b1126f54e2e78b
2022-12-06 17:40:29 +00:00
Treehugger Robot
7279c72b74 Merge "Generate cross partition kernel module dependencies" am: b4b8760144
Original change: https://android-review.googlesource.com/c/platform/build/+/2325560

Change-Id: I631211f39ada0d0ff483183a5788f817676c14a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 07:58:01 +00:00
Treehugger Robot
b4b8760144 Merge "Generate cross partition kernel module dependencies" 2022-12-06 07:30:56 +00:00
Treehugger Robot
6927cd75a5 Merge "Fix tests. Missing colon separator and typo" am: da3081848d
Original change: https://android-review.googlesource.com/c/platform/build/+/2329673

Change-Id: I8bd5343b0f0285b95c3fa47e6eff0bc52629de96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 04:38:12 +00:00
Treehugger Robot
da3081848d Merge "Fix tests. Missing colon separator and typo" 2022-12-06 04:12:18 +00:00
Joe Onorato
1cb9e157ec Fix tests. Missing colon separator and typo
Test: build/make/tests/b_tests.sh
Change-Id: Ie7d2b5b839b9d16db2c04980ea2d643118769e69
2022-12-05 17:06:30 -08:00
Kiyoung Kim
987e4d6fa6 Merge "Append LLNDK libraries in the APEX to the system linker config" am: eb3af10b0b
Original change: https://android-review.googlesource.com/c/platform/build/+/2322555

Change-Id: Ifd524a5f1a2b9501d6a2fc00d2e1a70ffa4fc5ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:56:27 +00:00
Kiyoung Kim
eb3af10b0b Merge "Append LLNDK libraries in the APEX to the system linker config" 2022-12-06 00:48:15 +00:00