Commit Graph

37104 Commits

Author SHA1 Message Date
Hsin-Yi Chen
bc5a4271ee Merge "Define a make target for all LLNDK dumps" into main 2024-02-21 07:42:50 +00:00
Hsin-Yi Chen
23d855680c Define a make target for all LLNDK dumps
- Define findlsdumps_LLNDK that vFRC process will build.
- Move LSDUMP_PATHS_FILE to target/product/gsi/Android.mk.
- Allow LLNDK dumps in prebuilts/abi-dumps/vndk.

Test: m findlsdumps_LLNDK check-vndk-list
Bug: 314010764
Change-Id: I6329cd4b1b919069291a13bd03720ceea46b95ff
2024-02-21 03:46:57 +00:00
Luca Farsi
a677887047 Split out host shared libs target from general-tests
Split out the building of the host shared libs zip from the
general-tests target so it can be built separately. building
general-tests will still build both.

Test: m general-tests, m general-tests-shared-libs
Bug: 314171817
Change-Id: I99f6d7ae5578d8bc97ddc0c047398defbf9b8cc9
2024-02-20 14:06:02 -08:00
Spandan Das
200c9588ae Merge "Revert "Revert "Create a product variable for skipping apex cont..."" into main am: 9001b9afbf
Original change: https://android-review.googlesource.com/c/platform/build/+/2967068

Change-Id: Ic094fbd2adb507a5ac4da63ce282d341fc20250a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 08:42:23 +00:00
Spandan Das
9001b9afbf Merge "Revert "Revert "Create a product variable for skipping apex cont..."" into main 2024-02-20 07:53:04 +00:00
Nikita Ioffe
839d2b4665 Merge "Remove unused PRODUCT_AVF_KERNEL_MODULES_ENABLED" into main am: 68e2e5375c
Original change: https://android-review.googlesource.com/c/platform/build/+/2962203

Change-Id: Ia5d091aeff88bb91df3529c8dfa9b32315d2122e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-19 18:02:20 +00:00
Nikita Ioffe
68e2e5375c Merge "Remove unused PRODUCT_AVF_KERNEL_MODULES_ENABLED" into main 2024-02-19 17:29:09 +00:00
Treehugger Robot
cdf83d02e2 Merge "Disable reboot to ram dump on zygote crash loop for -eng builds" into main am: 7298b076e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2963308

Change-Id: I1d12c2b3a554e4a60cd67647a50f54b4e3c773da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-18 14:44:48 +00:00
Treehugger Robot
7298b076e1 Merge "Disable reboot to ram dump on zygote crash loop for -eng builds" into main 2024-02-18 13:45:25 +00:00
Spandan Das
7416360cb3 Revert "Revert "Create a product variable for skipping apex cont..."
Revert submission 2966055-revert-2964509-skip-apex-contributions-EOKWOFHENC

Reason for revert: The root cause CL has been reverted https://googleplex-android-review.git.corp.google.com/c/platform/vendor/google/build/+/26268799

Reverted changes: /q/submissionid:2966055-revert-2964509-skip-apex-contributions-EOKWOFHENC

Change-Id: I9a40b652d38f1a4a4693e0cdb66cbe48632bafff
2024-02-17 03:31:51 +00:00
Treehugger Robot
d11fb36b2c Merge "Revert "Create a product variable for skipping apex contribution..."" into main am: cdf6054f03
Original change: https://android-review.googlesource.com/c/platform/build/+/2966055

Change-Id: Id31f9685f6edad909ae846280d4de18d1ac89121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 02:29:38 +00:00
Treehugger Robot
cdf6054f03 Merge "Revert "Create a product variable for skipping apex contribution..."" into main 2024-02-17 02:24:02 +00:00
Jihoon Kang
8804a8e2bd Revert "Create a product variable for skipping apex contribution..."
Revert submission 2964509-skip-apex-contributions

Reason for revert: 325666427

Reverted changes: /q/submissionid:2964509-skip-apex-contributions

Change-Id: I0172bdf99adce7b0eef42161c79cc7c1fdf977eb
2024-02-16 23:25:08 +00:00
Devin Moore
b3d429a72f Merge "consolidate filter commands for check_vintf_vendor_deps" into main am: 18a2ebc4ab
Original change: https://android-review.googlesource.com/c/platform/build/+/2966084

Change-Id: I912f7f0b9465cf3d34cae20658cded944cc7c80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 19:14:25 +00:00
Devin Moore
6795ca7804 consolidate filter commands for check_vintf_vendor_deps
It's faster to make one filter call.

Test: m
Bug: none
Change-Id: I629d30d8e63c8ac6d75334acc2b21acce352c43e
2024-02-16 18:00:08 +00:00
Devin Moore
9f3a786711 Merge "Add system_ext deps to check-vintf-all" into main am: 806e5c5874
Original change: https://android-review.googlesource.com/c/platform/build/+/2965723

Change-Id: I0df7d5ef814dad4929465d0e06a59a2031238068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 02:23:34 +00:00
Devin Moore
b1a331683b Add system_ext deps to check-vintf-all
The GSIs provide some framework HALs through system_ext so
check-vintf-all needs to depend on them in order to have them available
when checking with vitffm.

Test: lunch aosp_arm64-trunk_staging-userdebug && m check-vintf-all
Bug: 266741352
Change-Id: Id3eaad3a839c72a25aa8921a93de82bb119b0d8f
2024-02-15 22:39:20 +00:00
Nikita Ioffe
646de99112 Merge "Propagate RELEASE_AVF_MICRODROID_KERNEL_VERSION to Soong" into main am: 01767ec382
Original change: https://android-review.googlesource.com/c/platform/build/+/2962202

Change-Id: I0bfd4ba97f41dfdd5e5eceb30381d71ff968a461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 20:07:01 +00:00
Nikita Ioffe
01767ec382 Merge "Propagate RELEASE_AVF_MICRODROID_KERNEL_VERSION to Soong" into main 2024-02-15 19:19:47 +00:00
Jiyong Park
de8af59856 Disable reboot to ram dump on zygote crash loop for -eng builds
Bug: 323566535
Test: check sysprop
Change-Id: I4ee3b119bf4a0ff21c8e6d92e74eee084a54867e
2024-02-15 18:18:06 +09:00
Spandan Das
d1aa8af7d8 Merge "Create a product variable for skipping apex contribution contents" into main am: 6d7a094dd0
Original change: https://android-review.googlesource.com/c/platform/build/+/2964509

Change-Id: I1bcf3d60d59540547c6f450c7b351857f6360d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 08:57:24 +00:00
Spandan Das
6d7a094dd0 Merge "Create a product variable for skipping apex contribution contents" into main 2024-02-15 08:10:57 +00:00
Spandan Das
debf166cad Create a product variable for skipping apex contribution contents
This denylist will be used to ignore the prebuilt google apexes listed
in apex_contributions of vendor/google/build when building aosp products
in next.

Test: in main, lunch aosp_cf_x86_64_phone-next-userdebug && m nothing
(with ag/25842580)
Bug: 308187268

Change-Id: I5330b44caf15193a00f1e255cef24b67c794382b
Merged-In: I5330b44caf15193a00f1e255cef24b67c794382b
2024-02-15 01:38:50 +00:00
Nikita Ioffe
3ce74d19b0 Remove unused PRODUCT_AVF_KERNEL_MODULES_ENABLED
Test: presubmit
Change-Id: I5742c94376e8d31ff1fe74ef6da6e5ae67e9ef5c
2024-02-13 19:16:23 +00:00
Nikita Ioffe
19b5d66747 Propagate RELEASE_AVF_MICRODROID_KERNEL_VERSION to Soong
Bug: 298011555
Test: builds
Change-Id: I69a895318ea13fb1bee7bf0aec8893672b7bdf49
2024-02-13 19:13:04 +00:00
Treehugger Robot
d8c04fd026 Merge "Move setting default BOARD_VNDK_VERSION value" into main am: 9b3d6f91aa
Original change: https://android-review.googlesource.com/c/platform/build/+/2960351

Change-Id: I066fb29a388a0311fc9170dbe10a1c810deef71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:57:49 +00:00
Jihoon Kang
fee2a4b65e Merge "Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA" into main am: 7d2c5ff02d
Original change: https://android-review.googlesource.com/c/platform/build/+/2953878

Change-Id: I6f9f256ac5f17fad19c81ddcfa5b365a806ae61a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:56:46 +00:00
Inseob Kim
31051a565d Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main am: 5fd1645f11
Original change: https://android-review.googlesource.com/c/platform/build/+/2960347

Change-Id: Id99bd029aac84e6fa3c0790bec0488787f19787d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 13:55:25 +00:00
Kiyoung Kim
09aaa26c06 Move setting default BOARD_VNDK_VERSION value
Current BOARD_VNDK_VERSION is being set from config.mk, but this is
before build system loads release config and checks if VNDK is
deprecated or not. Move this to envsetup so it can set up
BOARD_VNDK_VERSION only when VNDK is not deprecated with flag.

Bug: 324976878
Test: mainline release target build succeeded

Change-Id: I490cc431038f5cebc40d03c98d2666eaba906664
2024-02-13 13:40:40 +09:00
Jihoon Kang
7d2c5ff02d Merge "Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA" into main 2024-02-13 04:27:21 +00:00
Inseob Kim
5fd1645f11 Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main 2024-02-13 04:02:36 +00:00
Inseob Kim
4e72d5e4da Revert^2 "Use vFRC version as-is for ToT sepolicy version"
fb3a97fc7d

Change-Id: I13612dee1ebc6aabbd3bc46fb4c30568dc23a6da
2024-02-13 02:20:00 +00:00
Kiyoung Kim
f74c3b5fe8 Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main am: 1d952f82a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2949648

Change-Id: I3b47559ad8182f8c8c04e345c8ef18bcc90c459a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 01:24:47 +00:00
Kiyoung Kim
1d952f82a5 Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main 2024-02-13 00:51:53 +00:00
Luca Stefani
15260e9dad Add custom images in fastboot-info
Test: m fastboot_info; m && fastboot flashall
Change-Id: I9a828d35992d684dfaacffd04006d420b7088736
2024-02-10 19:26:43 +01:00
Treehugger Robot
8aad1e80a7 Merge "proguard: add keep rules for @TestApi" into main am: 6b11584633
Original change: https://android-review.googlesource.com/c/platform/build/+/2956677

Change-Id: If2642bf2556c23143add3120397d2562401b2c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 23:05:52 +00:00
Makoto Onuki
d6ed17a010 Merge changes I8af63d1c,I10ceeae9 into main am: af0a5d71cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2955783

Change-Id: I96584448c05f5a74a8c9cbdf6331974c1e0a3ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09 00:42:57 +00:00
Yifei Zhang
f0581e65be proguard: add keep rules for @TestApi
Test: build
Bug: 319319578
Change-Id: I739a80c66de57d0ce68624246613722edf2d106f
2024-02-08 16:15:56 -08:00
Jeff Sharkey
91412af6e2 Basic ParcelFileDescriptor on Ravenwood.
One of the final foundational building blocks, which wraps a Java
`FileDescriptor` object.  Since many of the existing APIs here offer
to work with "raw" int FD values, we need to reach "behind the
curtain" to read/write the internal value.  Thankfully `SharedSecrets`
already offers a way to gain access without requiring us to open
up the entire `java.io` area of the `java.base` module.

Bring along `android.util.CloseGuard` as a no-op wrapper.

Bug: 324417456
Test: atest CtsOsTestCasesRavenwood
Merged-in: I8af63d1c5a4bb2ef76bd43594a1072f2ca537d68
Change-Id: I8af63d1c5a4bb2ef76bd43594a1072f2ca537d68
2024-02-08 11:33:58 -08:00
Jeff Sharkey
4416313943 Update XML template to reflect null device.
Ravenwood doesn't need a device, so add a "null" filter so that
atest doesn't hang waiting for one.

Bug: 292141694
Test: atest-dev CtsOsTestCasesRavenwood CtsOsTestCases
Merged-in: I10ceeae92c7622ea44ecbc315e23babe8b36516a
Change-Id: I10ceeae92c7622ea44ecbc315e23babe8b36516a
2024-02-08 11:33:45 -08:00
Makoto Onuki
e406793f57 Add ravenwood test config template
Modeled after robolectric_test_config_template.xml

Bug: 292141694
Test: m nothing --no-skip-soong-tests
Test: m hoststubgen ravenwood-runtime tradefed atest && atest-dev HostStubGenTest-framework-test
Merged-in: I9ef906074df65c93d9e1a4b4998e6137196075ed
Change-Id: I9ef906074df65c93d9e1a4b4998e6137196075ed
2024-02-08 11:33:37 -08:00
Ikjoon Jang
6e9bd101e8 Merge "Revert "Use vFRC version as-is for ToT sepolicy version"" into main am: 96b16f654d
Original change: https://android-review.googlesource.com/c/platform/build/+/2954994

Change-Id: If24356b1d7244ef9a76578dbdd9ea7b9f89d12d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 04:50:47 +00:00
Ikjoon Jang
96b16f654d Merge "Revert "Use vFRC version as-is for ToT sepolicy version"" into main 2024-02-08 04:47:21 +00:00
Ikjoon Jang
fb3a97fc7d Revert "Use vFRC version as-is for ToT sepolicy version"
Revert submission 2952245-vfrc_as_tot_sepolicy

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=mainline_modules_arm64-mainline-userdebug&lkgb=11421838&lkbb=11421957&fkbb=11421841, b/324335916

Reverted changes: /q/submissionid:2952245-vfrc_as_tot_sepolicy

Bug: 324335916
Change-Id: I573db8b1a7f7874e146eea1135594eb0f1b6658f
2024-02-08 02:53:55 +00:00
Jihoon Kang
c4500afd1b Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA
UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA enables user to specify
${codename}.${sha} as min_sdk_version and target_sdk_version in order to
support mainline train building into android build.

Test: TH
Bug: 295905124
Change-Id: I6c793bc83e88ec620ed5e2e87d0371bc2455cf1b
2024-02-08 01:46:28 +00:00
Inseob Kim
bff91ad0d1 Merge "Use vFRC version as-is for ToT sepolicy version" into main am: b9835251d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2911567

Change-Id: I8fe81865d57796f806b00b06420b3c153ef685b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 01:22:38 +00:00
Inseob Kim
b9835251d1 Merge "Use vFRC version as-is for ToT sepolicy version" into main 2024-02-08 01:12:47 +00:00
Kiyoung Kim
1e14cdfd56 Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION
Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION if VNDK is
deprecated. BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION should not be
used once VNDK is deprecated with KEEP_VNDK=false

Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: Iead60663bed3653e63e7a444a873cfaea50780b0
2024-02-07 21:07:23 +09:00
Ziwei Zhang
77d1f60f0c Merge "Generate 2.0 config for Mobly test." into main am: a8de90ce4c
Original change: https://android-review.googlesource.com/c/platform/build/+/2943045

Change-Id: I88b7a6a8d41a13316efd3ff768653fc51e5be929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 08:25:01 +00:00
Ziwei Zhang
a8de90ce4c Merge "Generate 2.0 config for Mobly test." into main 2024-02-07 07:38:39 +00:00