am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 447b4a4bf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475
Change-Id: I87b0e8079939f83d67b8bee41b05bb8057eb78e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 447b4a4bf0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475
Change-Id: I3eabdf074d5fbf0263a786a2d81798b25274b9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Adjust this test to align with VSR. First, skip the test if kernel is
< 5.10 or < Android 13. Second, allow non-dynamic partitions to be vfat.
Bug: 286038059
Test: vts_fs_test on CF
(cherry picked from https://android-review.googlesource.com/q/commit:084c94e43eb2916c84c72de524c6e8c3d5ec2d4f)
Merged-In: I5bd874f68296f7155d8c4366ebc13fe3d59c3ee6
Change-Id: I5bd874f68296f7155d8c4366ebc13fe3d59c3ee6
The 32-bit variant of libjsoncpp is not always installed
on 64-bit devices, so it must always be statically included.
We should probably collapse libcutils_test with
libcutils_test_static in the future.
Bug: 285357054
Test: libcutils_test
Merged-In: Ic84901ce5af766338b2cab07c3cf10841ba9a150
Change-Id: Ic84901ce5af766338b2cab07c3cf10841ba9a150
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 c786b6d332 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246
Change-Id: I3df523e96035f4d7790f5a64d9ad200aa7f8c96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I078ec06e1a9709accbea2398acbbf9cf8f12159a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I8f7e86357e806fa34a18ba2c17a9fd574f9d2b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9ce is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246
Change-Id: Idb0e736d5993d7d07df6527e8a353e96fd6e6dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Ibd161dc615c0b8baa5f9a458df45a14bd64798fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I9f54c31480f529106408a6a19cd8b677b0f7b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 c786b6d332 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246
Change-Id: I4008c84a91749c8fcb1fb6cfb924785f2d6daa8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I44038c64fdb82509ffb4a7073b0ec7ac2497709c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I453d4cb38ed881c7a3e252a538f6482a86866840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Ibb89bc08d8d47e0e2b0d7e545fff9ac21c4514b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I4a28bf132f9a59a45e80224fa40c56f0647e1de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ibcaa8406e8b1e8758b99a8e9b58c58d68ed57685 with SHA-1 e02ef9e9ce is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604246
Change-Id: I793fc3b2184ef106766daac5ec0b2648a06b8937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Id105ab288006b9050a037f5e079d725c08635f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Id754dbe20a5014380d2e6ea279d8c34771a023e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I9d46b3a18d796ece7098cb7b9ec6909293443f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I1b0c76ea8ea85f6a016cafa24c0695fbd153ae9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I6651fbb8b61d7c65e16324874621747b905295c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Id54735814b0d80faf052892cd4a3ee7574438b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Ia7420ff4d0e83d7aea24b4211a24f1ffc8a2d7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Ib31d9aca5a97176cd022d6486b5eb4101f330b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: Ibe542f5442106dd809afd7f679210ea67c6094ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6235d11033d2f30efe530077b877863ba2574810 with SHA-1 5b9c9ba1e0 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2604245
Change-Id: I60f0a27e7df8a4a119fd7e28b74e22dbf67fbddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
