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
e3159249cf
Merge "Create a denylist for skipping apex contribution contents" into main
2024-02-15 04:02:10 +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
Spandan Das
cc969e3722
Merge "Create a product variable for skipping apex contribution contents" into main
2024-02-15 01:33:59 +00:00
Spandan Das
e1c11d09ce
Create a denylist 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: I57a271d64bb940f36585fa3c666a3d95960a7083
2024-02-14 20:02:55 +00:00
Spandan Das
fb3ce3331a
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
2024-02-14 20:02:45 +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
4ecff7d61e
Merge "Move setting default BOARD_VNDK_VERSION value" into main am: 9b3d6f91aa
am: d8c04fd026
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2960351
Change-Id: If09de1210239fb84f23a1c8c8273df706fb6ee73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-13 14:41:40 +00:00
Jihoon Kang
5676affc41
Merge "Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA" into main am: 7d2c5ff02d
am: fee2a4b65e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2953878
Change-Id: I5522f46b5254bc3008a17a9749fb9602620fc014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-13 14:38:25 +00:00
Inseob Kim
8645704976
Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main am: 5fd1645f11
am: 31051a565d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2960347
Change-Id: I0e6038e9f360544a15d38596053bc4a96cce20e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-13 14:04: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
ae4dab909f
Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main am: 1d952f82a5
am: f74c3b5fe8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2949648
Change-Id: I68d09320131c2f9d06e3c25926e4eb464d7295ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-13 02:05:32 +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
c5827fb61f
Merge "proguard: add keep rules for @TestApi" into main am: 6b11584633
am: 8aad1e80a7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2956677
Change-Id: I6bc84f9e195be572c9be8773743836af802386bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-09 23:46:29 +00: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
Jeff Sharkey
82cf9f345a
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
Change-Id: I8af63d1c5a4bb2ef76bd43594a1072f2ca537d68
2024-02-08 09:41:39 -07: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
4f48cad760
Merge "Generate 2.0 config for Mobly test." into main am: a8de90ce4c
am: 77d1f60f0c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2943045
Change-Id: I738337f359be6b7ed9084ed9b4051d8ed71deeb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-07 09:05:01 +00: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
Inseob Kim
5653f37337
Use vFRC version as-is for ToT sepolicy version
...
Minor version hasn't been used. As we are moving to a new versioning
scheme, removing the minor version and using vFRC version as-is to align
with other vendor interfaces.
Bug: 314010177
Test: build and boot
Change-Id: I138c13c798a15cbb52c45cbad68e5a65cb1d0888
2024-02-06 03:56:49 +00:00
Kiyoung Kim
7a6b1250f7
Merge "Reapply "Rename LOCAL_USE_VNDK"" into main am: 58fe0a3924
am: 5e2f044232
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2949645
Change-Id: I7bbba5ad9dcfb9eaa8fa893c7aef5945341d5377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-06 01:58:30 +00:00
Kiyoung Kim
5e2f044232
Merge "Reapply "Rename LOCAL_USE_VNDK"" into main am: 58fe0a3924
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2949645
Change-Id: I757412e5acde9b5c32c0c456332e88cf5add150e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-06 01:19:54 +00:00
Kiyoung Kim
58fe0a3924
Merge "Reapply "Rename LOCAL_USE_VNDK"" into main
2024-02-06 00:57:21 +00:00
Evgenii Stepanov
a512d0e229
Merge "Add missing linker flags for memtag sanitizers." into main am: f6109a1842
am: 86df591582
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2945005
Change-Id: I53953e7488c4632b3755132f66a6853166c933fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-05 22:26:10 +00:00
Evgenii Stepanov
86df591582
Merge "Add missing linker flags for memtag sanitizers." into main am: f6109a1842
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2945005
Change-Id: I24376ff3f6cdee586e09a0e9ff7eb00988f5ba54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-05 21:44:31 +00:00
Evgenii Stepanov
f6109a1842
Merge "Add missing linker flags for memtag sanitizers." into main
2024-02-05 21:04:03 +00:00
Kiyoung Kim
454265c233
Reapply "Rename LOCAL_USE_VNDK"
...
LOCAL_USE_VNDK property refers if the module uses VNDK, and this
property is being used to check if the module is installed in vendor or
product. However, the term no longer makes sense with VNDK deprecation,
so it should be renamed. Similar to change in aosp/2897612, rename
LOCAL_USE_VNDK as LOCAL_IN_VENDOR or LOCAL_IN_PRODUCT.
Bug: 316829758
Test: AOSP CF build succeeded
Change-Id: I2da2e2027ccabbcfbb444abc6828addeb3b22e13
2024-02-05 11:01:41 +09:00