)]}' { "log": [ { "commit": "f5ed5ba1cc222c62988be88ce24afc8c6663f70d", "tree": "3739f11d4bbc3274033fef16f0a7bf90b18a0ca7", "parents": [ "2d32e09e374c52b8322e7209e122bfcb80506ce6" ], "author": { "name": "Alice Wang", "email": "aliceywang@google.com", "time": "Tue Mar 11 17:01:24 2025 +0000" }, "committer": { "name": "Alice Wang", "email": "aliceywang@google.com", "time": "Tue Mar 11 17:01:24 2025 +0000" }, "message": "Include authmgr vintf in Trusty QEMU\n\nBug: 377520831\nTest: m\nTest: atest vts_treble_vintf_vendor_test\nChange-Id: I3c90a3b4769d9fc5c229c8224da63301910c94ef\n" }, { "commit": "2d32e09e374c52b8322e7209e122bfcb80506ce6", "tree": "b8f70d7366567cfbd019b48c276c5ab76a427812", "parents": [ "af3c8fceed4940278098a48dbe6fc83f4ed41da4", "3060a88007773162c741d83dbd6a044266edd3cf" ], "author": { "name": "Alice Wang", "email": "aliceywang@google.com", "time": "Tue Mar 11 08:31:24 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 11 08:31:24 2025 -0700" }, "message": "Merge \"Include ISecureStorage vintf in Trusty QEMU\" into main" }, { "commit": "3060a88007773162c741d83dbd6a044266edd3cf", "tree": "a5c70edbb25e2efdae9f82f84d6079ebb92643d2", "parents": [ "27de87879b5737955b4e7dfe7b3beae7ba268710" ], "author": { "name": "Alice Wang", "email": "aliceywang@google.com", "time": "Mon Mar 10 13:32:57 2025 +0000" }, "committer": { "name": "Alice Wang", "email": "aliceywang@google.com", "time": "Mon Mar 10 13:33:54 2025 +0000" }, "message": "Include ISecureStorage vintf in Trusty QEMU\n\nBug: 377520831\nTest: m\nTest: atest vts_treble_vintf_vendor_test\nChange-Id: Ib7f5d7aaff095ffa13867217a4f9ea8d622cf14c\n" }, { "commit": "af3c8fceed4940278098a48dbe6fc83f4ed41da4", "tree": "370693e85b2bcd2bec84d42c719064f952bcd640", "parents": [ "c3f3bcf29f3e162c9b077a5b9b24333336a73d23", "b2ab01b63c66455af442ce9f6d99b457f16be641" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:16 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:16 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: I7c647bbc51cec0326d50f89a8ea816f0423b8e1c\nChange-Id: Ia30abbbd075bcc3a63f10b28eca69c3b33ffbf51\n" }, { "commit": "b2ab01b63c66455af442ce9f6d99b457f16be641", "tree": "370693e85b2bcd2bec84d42c719064f952bcd640", "parents": [ "e0a23791fd93b376373ac0dfb3d0aa3c4fdb5f02", "c3f3bcf29f3e162c9b077a5b9b24333336a73d23" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sat Mar 08 06:47:29 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Mar 08 06:47:29 2025 -0800" }, "message": "dhcp: add dhcp client am: c3f3bcf29f\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3532131\n\nChange-Id: I92a814e82a66ed321cfd1d938c1d69e152caafee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c3f3bcf29f3e162c9b077a5b9b24333336a73d23", "tree": "147eda02076305e05a190adc14a365135593bdb9", "parents": [ "27de87879b5737955b4e7dfe7b3beae7ba268710" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sat Mar 08 05:52:02 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sat Mar 08 05:12:31 2025 -0800" }, "message": "dhcp: add dhcp client\n\nnow that Ranchu deprecated the native dhcpclient, integrate\nit locally into device/generic/trusty, until Trusty QEMU can\nfully be uplifted and can inherit from goldfish/ranchu products.\nsee b/401655199.\n\nBug: 399646721\nTest: qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I684ad7ba633c1dd48912efcfd64469aa64b4446c\n" }, { "commit": "e0a23791fd93b376373ac0dfb3d0aa3c4fdb5f02", "tree": "0235415f7b1b6749f3abf155afb442015073a1b2", "parents": [ "7496713a159d836528edf7bc1a8e938f60553d00", "27de87879b5737955b4e7dfe7b3beae7ba268710" ], "author": { "name": "Orlando Arbildo", "email": "oarbildo@google.com", "time": "Wed Mar 05 09:58:13 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 05 09:58:13 2025 -0800" }, "message": "Merge \"trusty: add hwcryptohal service\" into main am: 27de87879b\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3517890\n\nChange-Id: I039d7994ef4156bc629d8109e53f060d766386a7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "27de87879b5737955b4e7dfe7b3beae7ba268710", "tree": "e945b381d9b06c2a2939a47d6d7a238899f103ea", "parents": [ "596f2d6cf3e20164b75bb3d3b253a391524a2c69", "3e877fcb0d863a0409e4d467fda4d270823315dc" ], "author": { "name": "Orlando Arbildo", "email": "oarbildo@google.com", "time": "Wed Mar 05 09:35:41 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 05 09:35:41 2025 -0800" }, "message": "Merge \"trusty: add hwcryptohal service\" into main" }, { "commit": "7496713a159d836528edf7bc1a8e938f60553d00", "tree": "64db2d20f92272bd968be617eb0774cb67a0e7af", "parents": [ "79ac0fb14e1f421a1c268f2e9c53889719fc492b", "596f2d6cf3e20164b75bb3d3b253a391524a2c69" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Tue Mar 04 11:19:58 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 04 11:19:58 2025 -0800" }, "message": "Merge \"Allow storageproxyd to call vold\" into main am: 596f2d6cf3\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3487210\n\nChange-Id: Ia1e322c69b8dbdcbc7dad0cb3c3f718a271b9549\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "596f2d6cf3e20164b75bb3d3b253a391524a2c69", "tree": "9efa53f4027ed75971e93a3e2576a21a0acdaae9", "parents": [ "25fa411f45a9112722fa0c520dbcf8c57a65cd85", "8f81b350acfba7754b8178077d1cd1361a89170d" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Tue Mar 04 10:46:23 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 04 10:46:23 2025 -0800" }, "message": "Merge \"Allow storageproxyd to call vold\" into main" }, { "commit": "79ac0fb14e1f421a1c268f2e9c53889719fc492b", "tree": "8b404b6e2d2e6a329addfdc28aa5f58880072d53", "parents": [ "8881072925ed81e0cbc3a5a6c60478664c1bf54a", "25fa411f45a9112722fa0c520dbcf8c57a65cd85" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Mar 03 02:30:27 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 03 02:30:27 2025 -0800" }, "message": "Add pvmfw support for protected VM testing am: 25fa411f45\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473836\n\nChange-Id: I25ffacf6c4e61d915b638869bd5ae48cd97b430c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8881072925ed81e0cbc3a5a6c60478664c1bf54a", "tree": "f17c5dc5577d1496c94dced44715b5d5164ee33b", "parents": [ "73cb9a5dcdda942879792f8b0091c45e419338a7", "5272c9b989015982c6c4f689c23d77b5fd0b216c" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Mar 03 00:42:20 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 03 00:42:20 2025 -0800" }, "message": "qemu_trusty_base.mk: init trusty_tee.enabled soong variable am: 5272c9b989\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3517410\n\nChange-Id: I95273626d2cd27af23dae2970dbfa9a9b8d784cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "25fa411f45a9112722fa0c520dbcf8c57a65cd85", "tree": "912055d136b3f4d6ac3d20c09de716d7b818085a", "parents": [ "5272c9b989015982c6c4f689c23d77b5fd0b216c" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sun Feb 02 08:34:53 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sat Mar 01 12:24:34 2025 +0000" }, "message": "Add pvmfw support for protected VM testing\n\n- add soong genrule allowing to generate a complete\n pvmfw image (with bcc.dat) for the QEMU simulation\n- support the two development (--protected \u0026\n --protected-without-firmware)\n\nBug: 393850980\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I5574b3f91509f2a5e8c110d0a928377586ff6eb2\n" }, { "commit": "8f81b350acfba7754b8178077d1cd1361a89170d", "tree": "4e9c03f64853de404f482c0712eca40104306e80", "parents": [ "4ded7fd4fb3b5dca693ffe692f8228ed91b624a6" ], "author": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Mon Feb 10 10:16:33 2025 -0600" }, "committer": { "name": "Weston Carvalho", "email": "westoncarvalho@google.com", "time": "Fri Feb 28 15:47:25 2025 -0600" }, "message": "Allow storageproxyd to call vold\n\nBug: 393406566\nTest: m\nChange-Id: Id5328ffa8462cd8fa3a5406a7b6acca7df221b59\n" }, { "commit": "3e877fcb0d863a0409e4d467fda4d270823315dc", "tree": "031ccc057215476cbbd14d7f126723d4ca3e863e", "parents": [ "c7ca0d4bbfbcf38c542a8863fa7f1f57f1d9388a" ], "author": { "name": "Orlando Arbildo", "email": "oarbildo@google.com", "time": "Fri Feb 28 17:44:25 2025 +0000" }, "committer": { "name": "Orlando Arbildo", "email": "oarbildo@google.com", "time": "Fri Feb 28 17:44:25 2025 +0000" }, "message": "trusty: add hwcryptohal service\n\nAdding hwcrypto hal service to trusty target\n\nBug: 393162614\nTest: lunch qemu-arm64-trusty\nChange-Id: I718e3937e62382d24688df2745fe8c408a605ca7\n" }, { "commit": "5272c9b989015982c6c4f689c23d77b5fd0b216c", "tree": "7f34ccb0b0ac6c68b89bb0755100ae6d8c37c2c6", "parents": [ "4ded7fd4fb3b5dca693ffe692f8228ed91b624a6" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Fri Feb 28 13:57:17 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Fri Feb 28 13:59:50 2025 +0000" }, "message": "qemu_trusty_base.mk: init trusty_tee.enabled soong variable\n\nBug: 398609149\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\n m dist trusty-tee_package\nChange-Id: Ifac966ed723b85f0881fe3d15e19f4e631b9f35a\n" }, { "commit": "73cb9a5dcdda942879792f8b0091c45e419338a7", "tree": "8f0ac6f258ac2e47bc2b2bf58c9aed9954262fc8", "parents": [ "4cfc59bed4da07ead571b964ab1495f0644e333b", "bc3df968033b0ce18fc51b1a8ff453277604deba" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 27 15:24:39 2025 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 27 15:24:39 2025 -0800" }, "message": "Merge \"Merge 25Q1 (ab/12770256) to aosp-main-future\" into aosp-main-future" }, { "commit": "4cfc59bed4da07ead571b964ab1495f0644e333b", "tree": "09afdb942bdb7dbb76ebc2c5724bb0eb2174acc2", "parents": [ "da99780d744cc846f1e05f77931c1d4c4e63c8cc", "4ded7fd4fb3b5dca693ffe692f8228ed91b624a6" ], "author": { "name": "Jay Monkman", "email": "jmonkman@google.com", "time": "Thu Feb 27 13:34:25 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 27 13:34:25 2025 -0800" }, "message": "Add system_heap.ko to Microdroid vendor image am: 4ded7fd4fb\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3511971\n\nChange-Id: Id420b48d37f501b16f46e410a692081b1626b39e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4ded7fd4fb3b5dca693ffe692f8228ed91b624a6", "tree": "09afdb942bdb7dbb76ebc2c5724bb0eb2174acc2", "parents": [ "c7ca0d4bbfbcf38c542a8863fa7f1f57f1d9388a" ], "author": { "name": "Jay Monkman", "email": "jmonkman@google.com", "time": "Wed Feb 26 21:53:05 2025 -0600" }, "committer": { "name": "Jay Monkman", "email": "jmonkman@google.com", "time": "Wed Feb 26 21:53:05 2025 -0600" }, "message": "Add system_heap.ko to Microdroid vendor image\n\nBug: 394191072\nTest: run-microdroid --protected --vendor .../microdroid_vendor.img\nChange-Id: Ia184eaaea479d75bf4dd07b0c0512b9aea0e001a\nSigned-off-by: Jay Monkman \u003cjmonkman@google.com\u003e\n" }, { "commit": "bc3df968033b0ce18fc51b1a8ff453277604deba", "tree": "3ca48e08585f1853e047ab8cdd23f2c3b92c5c2f", "parents": [ "da99780d744cc846f1e05f77931c1d4c4e63c8cc", "a71da506fb37b3bde26102d682c440fe449ba4c0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 20 09:38:51 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 20 09:38:51 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I3b4b16073cfb1f64bfed7356767816605c47d002\nChange-Id: I1ae5bff1dc40b5fe8350aa2050d0188f05c22127\n" }, { "commit": "da99780d744cc846f1e05f77931c1d4c4e63c8cc", "tree": "ada2d7183a39e777a9b32ed570d449b58375d34e", "parents": [ "49af3e6b9344d87e49bc41962143489b8b5275ef", "c7ca0d4bbfbcf38c542a8863fa7f1f57f1d9388a" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Thu Feb 20 09:34:47 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 20 09:34:47 2025 -0800" }, "message": "qemu_trusty_base.mk: select keymint.trusty_tee vendor apex am: c7ca0d4bbf\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3501894\n\nChange-Id: I3dba4d450e16fa5a15efd0d9e9fdf4f2d1c825f6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c7ca0d4bbfbcf38c542a8863fa7f1f57f1d9388a", "tree": "ada2d7183a39e777a9b32ed570d449b58375d34e", "parents": [ "89867dbbcf022d31446753e99a2c76920609ef17" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Thu Feb 20 09:35:54 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Thu Feb 20 09:42:40 2025 +0000" }, "message": "qemu_trusty_base.mk: select keymint.trusty_tee vendor apex\n\nThis makes Keymint Rust TA in TEE as the default HAL implementation\nfor arm64 targets, without the need to append this option to the\nTrusty QEMU run.py.\n\nBug: 392769828\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: Iab571d0d0729e7deec9f99829e35b6d5c379b22d\n" }, { "commit": "49af3e6b9344d87e49bc41962143489b8b5275ef", "tree": "d773c1bddf1554f18b1253176719f78a4e94d7a2", "parents": [ "724a165fc20d3bb3da2ae0fb647d79a6c1a05b53", "89867dbbcf022d31446753e99a2c76920609ef17" ], "author": { "name": "Sudhin Mishra", "email": "sudhin@google.com", "time": "Wed Feb 19 14:05:11 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 19 14:05:11 2025 -0800" }, "message": "trusty: product-packages: Include Perfetto support am: 89867dbbcf\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3435399\n\nChange-Id: I1b30e16287c5352db136beb15b015425a5910672\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "89867dbbcf022d31446753e99a2c76920609ef17", "tree": "d773c1bddf1554f18b1253176719f78a4e94d7a2", "parents": [ "ec3ed36fa054bd62d6f811bfb66fbae23af7e22b" ], "author": { "name": "Sudhin Mishra", "email": "sudhin@google.com", "time": "Thu Jan 02 19:00:48 2025 +0000" }, "committer": { "name": "Sudhin Mishra", "email": "sudhin@google.com", "time": "Wed Feb 19 20:09:10 2025 +0000" }, "message": "trusty: product-packages: Include Perfetto support\n\nAdd Perfetto tools to the PRODUCT_PACKAGES.\n\nTest: Build Trusty target and check for the presence of Perfetto tools bin\u0027s/lib\u0027s on the target using ADB.\nBug: 3435399\nChange-Id: I992d4e8f726e0d51209311da4fe27d05c3e71aa7\n" }, { "commit": "724a165fc20d3bb3da2ae0fb647d79a6c1a05b53", "tree": "c959b07e57939e70cf00800e3a1f5615f678bcb6", "parents": [ "ca581abadb661e2f36a4a54c16dbb0a1d46e3d4b", "ec3ed36fa054bd62d6f811bfb66fbae23af7e22b" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Feb 17 08:12:05 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 17 08:12:05 2025 -0800" }, "message": "qemu_trusty_base.mk: add the optional proprietary packages am: ec3ed36fa0\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3495446\n\nChange-Id: I2885d3854c31df8e7b2c4412a051e276dc2ee34f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ec3ed36fa054bd62d6f811bfb66fbae23af7e22b", "tree": "c959b07e57939e70cf00800e3a1f5615f678bcb6", "parents": [ "4633d7d4a5b1f9e7dd611938eb292af8bfd9c7f8" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Feb 17 07:20:36 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Feb 17 07:20:36 2025 +0000" }, "message": "qemu_trusty_base.mk: add the optional proprietary packages\n\nBug: 395705546\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: Ic3f7113f94ea8393bb29ab93d9f8b5ab58acc523\n" }, { "commit": "ca581abadb661e2f36a4a54c16dbb0a1d46e3d4b", "tree": "1cded73a30e5df21e375fb60193abfc2b1d16b65", "parents": [ "361463139342cce6d9b4c6fdb7a1ca2ac1ccad0b", "4633d7d4a5b1f9e7dd611938eb292af8bfd9c7f8" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sat Feb 15 07:54:34 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 15 07:54:34 2025 -0800" }, "message": "init.qemu_trusty.rc: fix secure storage persist bootstrap am: 4633d7d4a5\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3497493\n\nChange-Id: I2c717d4a4758fb9180250bae8ad87491390c9861\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4633d7d4a5b1f9e7dd611938eb292af8bfd9c7f8", "tree": "1cded73a30e5df21e375fb60193abfc2b1d16b65", "parents": [ "5c01128a1fed3a286bb8d3d6d75da80fcfac8ecf" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sat Feb 15 08:09:55 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sat Feb 15 08:16:12 2025 +0000" }, "message": "init.qemu_trusty.rc: fix secure storage persist bootstrap\n\nBug: 396729279\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I4ea15a0d8cc00d8c1328b9dfc8d2a14f9827952c\n" }, { "commit": "361463139342cce6d9b4c6fdb7a1ca2ac1ccad0b", "tree": "9d5d8dda8a83cdecee92f41e950c7ddfb3e77c33", "parents": [ "c388cbdb6cbf2117f7ad715bc0067e2feb870fe6", "5c01128a1fed3a286bb8d3d6d75da80fcfac8ecf" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Feb 14 13:09:59 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 14 13:09:59 2025 -0800" }, "message": "Merge \"Add Microdroid vendor image\" into main am: 5c01128a1f\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3475043\n\nChange-Id: I973fb22a39c6052a3db1b91a1290c5935a11331c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5c01128a1fed3a286bb8d3d6d75da80fcfac8ecf", "tree": "9d5d8dda8a83cdecee92f41e950c7ddfb3e77c33", "parents": [ "c474031bf4b43f2547b0bd32a2e80d07f306ae07", "1c62a2ee4584d9b8792cadf129a22226ad43852b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Feb 14 12:30:04 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 14 12:30:04 2025 -0800" }, "message": "Merge \"Add Microdroid vendor image\" into main" }, { "commit": "1c62a2ee4584d9b8792cadf129a22226ad43852b", "tree": "942d669170b92039942937b4b227960890f551c0", "parents": [ "6b6a3b2130d18c96d88fd45e1338f7739c8597bb" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Tue Feb 04 02:02:53 2025 +0000" }, "committer": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Thu Feb 13 01:02:56 2025 +0000" }, "message": "Add Microdroid vendor image\n\nThe new vendor image contains several packages for\ntesting Trusty:\n* The trusty-ut-ctrl and tipc-test CLI tools\n* All the vendor modules needed for a guest to connect to TZ\n* ueventd configuration for the devices\n* init.rc file to load the modules\n\nBug: 394191072\nTest: run-microdroid --protected --vendor .../microdroid_vendor.img\nChange-Id: I82d32c15ec87d7ccb86aa701d082e76ebfa56585\n" }, { "commit": "c388cbdb6cbf2117f7ad715bc0067e2feb870fe6", "tree": "548982df56d34c08096c655e36d229fecd3efc53", "parents": [ "5557bdc01fe94fe1b8b1f4f26b08f5184a43f4c1", "c474031bf4b43f2547b0bd32a2e80d07f306ae07" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Feb 12 03:20:03 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 03:20:03 2025 -0800" }, "message": "Merge \"BoardConfig.mk: increase userdata partition to 512M\" into main am: c474031bf4\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3491071\n\nChange-Id: Icbdbed367bcc483832ce8fd1436e3b0a5bbf3bf3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c474031bf4b43f2547b0bd32a2e80d07f306ae07", "tree": "548982df56d34c08096c655e36d229fecd3efc53", "parents": [ "6b6a3b2130d18c96d88fd45e1338f7739c8597bb", "9fcce8720fd00f47184cb69c8449fcadd87fa980" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Feb 12 03:00:09 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 12 03:00:09 2025 -0800" }, "message": "Merge \"BoardConfig.mk: increase userdata partition to 512M\" into main" }, { "commit": "5557bdc01fe94fe1b8b1f4f26b08f5184a43f4c1", "tree": "982b722681616ff4d68cbd80c254f48d23e109e6", "parents": [ "f58b47d4834478cd5b1265daa068c0d06fea7d94", "6b6a3b2130d18c96d88fd45e1338f7739c8597bb" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Tue Feb 11 22:43:56 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 11 22:43:56 2025 -0800" }, "message": "Move Trusty build files to Soong namespace am: 6b6a3b2130\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3489847\n\nChange-Id: I9c0907cd85e9119a631d7f768f324746874eeb68\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9fcce8720fd00f47184cb69c8449fcadd87fa980", "tree": "09454b36252bdc056ed2957db20b00d4a02a294b", "parents": [ "019cb52c893b319370e030732da5db322e81d960" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Wed Feb 12 06:27:45 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Wed Feb 12 06:27:45 2025 +0000" }, "message": "BoardConfig.mk: increase userdata partition to 512M\n\nAllows to fit all nativetest64 and in particular\nthe trusty_test_vm which payload is ~100MB\n\nBug: 392769828\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I4542715391eea61401be270af09df3e6518fa5a6\n" }, { "commit": "6b6a3b2130d18c96d88fd45e1338f7739c8597bb", "tree": "982b722681616ff4d68cbd80c254f48d23e109e6", "parents": [ "019cb52c893b319370e030732da5db322e81d960" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Wed Feb 12 03:52:16 2025 +0000" }, "committer": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Wed Feb 12 03:53:38 2025 +0000" }, "message": "Move Trusty build files to Soong namespace\n\nPut all the Trusty Soong device modules in a namespace\nto avoid build conflicts with other builds.\n\nBug: 394191072\nTest: presubmit\nChange-Id: Ic83fc9eefa6559dc146f4681a07eac3e61249ce5\n" }, { "commit": "f58b47d4834478cd5b1265daa068c0d06fea7d94", "tree": "dd3c6f4a466dc5cddffc025f17fb5dcd8710d4b7", "parents": [ "d8d2b92aa2a010b38741445d525c9c41a54a65bb", "019cb52c893b319370e030732da5db322e81d960" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 11 10:53:09 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 11 10:53:09 2025 -0800" }, "message": "Enable AVF Trusty security VM am: 019cb52c89\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473318\n\nChange-Id: Ide966d070a1635646a41f098f1e01901b943b40a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "019cb52c893b319370e030732da5db322e81d960", "tree": "dd3c6f4a466dc5cddffc025f17fb5dcd8710d4b7", "parents": [ "6f0891bbcdbfac9bb5732c7e7f85ba420c89e5e4" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 08:45:00 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 11 16:10:40 2025 +0000" }, "message": "Enable AVF Trusty security VM\n\n- create one apex for Keymint HAL on Security VM\n- complement device makefile with pKVM\n- add vm launcher makefile\n- update sepolicy rules\n\nBug: 392769828\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I496ce2d793564ece3bb5733ca7c17427ec685b9c\n" }, { "commit": "d8d2b92aa2a010b38741445d525c9c41a54a65bb", "tree": "89b7d8cf60b7dbbdc80747fe2322da2db6d78b6c", "parents": [ "58799f44440b65d739592c8963eef8c39d911af4", "6f0891bbcdbfac9bb5732c7e7f85ba420c89e5e4" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Feb 10 06:09:44 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 10 06:09:44 2025 -0800" }, "message": "Add support for system_ext storageproxyd am: 6f0891bbcd\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473317\n\nChange-Id: I529e166b01839d6b4fa8cf79f51e5f3fc170b421\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "58799f44440b65d739592c8963eef8c39d911af4", "tree": "3a7d0df5964c5f3b80df31349416328bbb865de0", "parents": [ "2a4f0f38f9ab2a41521ede14f3694f3b3ef8dde1", "dda4c3544ab9eae28cee910c34d9d6f509af21cc" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sat Feb 08 19:06:45 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 08 19:06:45 2025 -0800" }, "message": "Support metadata partition on Trusty QEMU am: dda4c3544a\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473834\n\nChange-Id: I618a4e4e7a1ea3bc6c8635051de9205b6f0c1670\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6f0891bbcdbfac9bb5732c7e7f85ba420c89e5e4", "tree": "89b7d8cf60b7dbbdc80747fe2322da2db6d78b6c", "parents": [ "dda4c3544ab9eae28cee910c34d9d6f509af21cc" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 06:34:22 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sun Feb 09 01:31:46 2025 +0000" }, "message": "Add support for system_ext storageproxyd\n\n- enable system_ext partition in QEMU config\n- enable storageproxyd in system_ext when TRUSTY_SYSTEM_VM\u003dnonsecure\n\nBug: 392489757\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I90769c92bfb12a51da6b5e82849ba254f5bf0b44\n" }, { "commit": "dda4c3544ab9eae28cee910c34d9d6f509af21cc", "tree": "3a7d0df5964c5f3b80df31349416328bbb865de0", "parents": [ "5b04aa63234ecb41ed8b60dc0e4a6c9a45cba3a6" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Wed Jan 29 07:33:01 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Sun Feb 09 01:26:56 2025 +0000" }, "message": "Support metadata partition on Trusty QEMU\n\nBug: 392489757\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I73fb349e79b81fbfa5180246cb5dc1b9b7ff3bea\n" }, { "commit": "2a4f0f38f9ab2a41521ede14f3694f3b3ef8dde1", "tree": "d01e9c7b8ba256b8b8c31cb38b490baf85da80b7", "parents": [ "80fadaab69e47b686cc0d0528a65e01def08abb9", "5b04aa63234ecb41ed8b60dc0e4a6c9a45cba3a6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Feb 06 15:23:44 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 15:23:44 2025 -0800" }, "message": "Merge \"Enable Keymint HAL to be selected via vendor apex\" into main am: 5b04aa6323\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473316\n\nChange-Id: Idaefb28efa04f1058f9fd182c6fab903c121b54d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5b04aa63234ecb41ed8b60dc0e4a6c9a45cba3a6", "tree": "d01e9c7b8ba256b8b8c31cb38b490baf85da80b7", "parents": [ "aa516df27b45e23fbee89a6e6b9ce96f05015263", "c4f135c0b5d2e15a29386d792a72291b39744a26" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Feb 06 15:00:59 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 06 15:00:59 2025 -0800" }, "message": "Merge \"Enable Keymint HAL to be selected via vendor apex\" into main" }, { "commit": "80fadaab69e47b686cc0d0528a65e01def08abb9", "tree": "27e7f5a71265c10004e8dce283ac1f7e47117409", "parents": [ "73be03ced407109dbd4c1d1ce61d595fed9f5040", "aa516df27b45e23fbee89a6e6b9ce96f05015263" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Feb 06 13:27:36 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 13:27:36 2025 -0800" }, "message": "Merge \"Bump trusty device manifest to 202504\" into main am: aa516df27b\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3478012\n\nChange-Id: Ie65a52a224da542174b371552469d9456f12adc6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aa516df27b45e23fbee89a6e6b9ce96f05015263", "tree": "27e7f5a71265c10004e8dce283ac1f7e47117409", "parents": [ "97a5bc5dc3041387762ba2c11383d4c075760afd", "e7c054662c2099ac71fff222538f4c13fe190744" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Feb 06 13:01:35 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 06 13:01:35 2025 -0800" }, "message": "Merge \"Bump trusty device manifest to 202504\" into main" }, { "commit": "e7c054662c2099ac71fff222538f4c13fe190744", "tree": "b8af484c987e8a8b09a24f0e33de8899700d14d2", "parents": [ "1f750a8a51b6c814e9d8bb03226f6ab8bcb7512e" ], "author": { "name": "Devin Moore", "email": "devinmoore@google.com", "time": "Wed Feb 05 23:37:41 2025 +0000" }, "committer": { "name": "Devin Moore", "email": "devinmoore@google.com", "time": "Wed Feb 05 23:37:41 2025 +0000" }, "message": "Bump trusty device manifest to 202504\n\nThe only declared services on this target satisfy the latest FCM so bump\nit to 202504 so we don\u0027t have to keep bumping this every year.\n\nTest: lunch qemu_trusty_arm64-trunk_staging-eng \u0026\u0026 m\nBug: 388074589\nChange-Id: I65fa24ff4a45a3d20bef5af8ed199e82b72cd6cd\n" }, { "commit": "c4f135c0b5d2e15a29386d792a72291b39744a26", "tree": "c9831d047123cf0e37ac0226af8dc74d9827b0d7", "parents": [ "97a5bc5dc3041387762ba2c11383d4c075760afd" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Feb 03 23:53:51 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Wed Feb 05 20:39:04 2025 +0000" }, "message": "Enable Keymint HAL to be selected via vendor apex\n\n- qemu_trusty_base: add missing Android dependencies\n supporting apex and config flags\n- add a trusty generic device apex directory\n- add file context entries the keymint hal services\n triggered by init.rc instead of the `early_hal` event\n- init.qemu_trusty.rc: support checking for apex selection\n\nBug: 392769828\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\n\nChange-Id: I3b2bb22d6eae833ccbadc83fa2bca22fac3aeec6\n" }, { "commit": "73be03ced407109dbd4c1d1ce61d595fed9f5040", "tree": "d410e0fe0d3884a5f7a537a54880a9690f643992", "parents": [ "e1d69e6732af4d5a73d74c9c23c6a096c94301f2", "97a5bc5dc3041387762ba2c11383d4c075760afd" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 04 16:33:22 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 04 16:33:22 2025 -0800" }, "message": "Merge \"PREUPLOAD.cfg: update with rustfmt \u0026 bpfmt\" into main am: 97a5bc5dc3\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3474739\n\nChange-Id: I7e78a15c4fe03d4d41571ad5de05031763ac8b9f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "97a5bc5dc3041387762ba2c11383d4c075760afd", "tree": "d410e0fe0d3884a5f7a537a54880a9690f643992", "parents": [ "3da490f45cc574b3767b30ccbd4edc8a9ceaffcb", "d76462923decf548171a1c06eb443aebf70fdb11" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 04 16:02:28 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 04 16:02:28 2025 -0800" }, "message": "Merge \"PREUPLOAD.cfg: update with rustfmt \u0026 bpfmt\" into main" }, { "commit": "d76462923decf548171a1c06eb443aebf70fdb11", "tree": "15e0c7e6785c9fb91585cfafdc25b1c5f5958406", "parents": [ "082f4363a8137eb5decc0f5f90b7d4a3ba32aa07" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 23:17:00 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 23:17:00 2025 +0000" }, "message": "PREUPLOAD.cfg: update with rustfmt \u0026 bpfmt\n\nBug: 392489757\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I5ee3ea51c7051a72715a9a55c69245bb676d6743\n" }, { "commit": "e1d69e6732af4d5a73d74c9c23c6a096c94301f2", "tree": "923ca5f974a23c642e9e84100e45022c794cb74b", "parents": [ "ef4db83bb99e3896194f9474c19e8107bf189f79", "3da490f45cc574b3767b30ccbd4edc8a9ceaffcb" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 06:04:35 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 04 06:04:35 2025 -0800" }, "message": "BoardConfig: reuse ranchu\u0027s sepolicy am: 3da490f45c\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473315\n\nChange-Id: I08ae86716095c2b9278101fcb8dbad29228a1214\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ef4db83bb99e3896194f9474c19e8107bf189f79", "tree": "7b1a63676c3d305d4e1879c44a68848eef84e1c9", "parents": [ "cbfc0fd40456b864e82c39b09b2a45aab42a0c46", "eb35386ab9cb84dbd4392552941852d29d2d8177" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 04:06:38 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 04 04:06:38 2025 -0800" }, "message": "qemu_trusty_base.mk: init VENDOR_SECURITY_PATCH am: eb35386ab9\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473314\n\nChange-Id: Ib9d46e2dc69c78fdfa8e498ec68e8236e71472c8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cbfc0fd40456b864e82c39b09b2a45aab42a0c46", "tree": "76806aa337c14d19a1d751789b5ae9a6bf9c096e", "parents": [ "9a82b665d3683fc434e8348b3095d7cb2b443092", "26017468139ec9736d4752f814fb05f333411d18" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 02:32:44 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 04 02:32:44 2025 -0800" }, "message": "storageproxyd: start early `on post-fs` am: 2601746813\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473830\n\nChange-Id: I6692199574071045d0dfb50918e5015105709515\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a82b665d3683fc434e8348b3095d7cb2b443092", "tree": "2e2f03bbe53915515fc8230239d9349609261137", "parents": [ "9b13794f34804bc7b728e25d336d6bfcdc2c1314", "37829f0c71fc7df855e5a28256e136802755022f" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 02:32:34 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 04 02:32:34 2025 -0800" }, "message": "add OWNERS file am: 37829f0c71\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3473832\n\nChange-Id: I0e8742094c022ea84827099cc56d8a144cc1d636\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3da490f45cc574b3767b30ccbd4edc8a9ceaffcb", "tree": "923ca5f974a23c642e9e84100e45022c794cb74b", "parents": [ "eb35386ab9cb84dbd4392552941852d29d2d8177" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Feb 03 23:44:56 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 05:27:04 2025 +0000" }, "message": "BoardConfig: reuse ranchu\u0027s sepolicy\n\nRanchu is the mininal Android QEMU device\nTrusty should reused and not duplicate Ranchu\u0027s\nas much as possible.\nThis change reuses Ranchu\u0027s sepolicy instead of\nduplicating.\n\nBug: 392489757\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: If38507f57634d1a74907a4d544bd6648e6fe390d\n" }, { "commit": "eb35386ab9cb84dbd4392552941852d29d2d8177", "tree": "7b1a63676c3d305d4e1879c44a68848eef84e1c9", "parents": [ "26017468139ec9736d4752f814fb05f333411d18" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Feb 03 23:38:09 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 05:26:53 2025 +0000" }, "message": "qemu_trusty_base.mk: init VENDOR_SECURITY_PATCH\n\nAllows Keymint HAL to properly provision Keymint TA\n\nBug: 392489757\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: If281b9a6a052027fd1d76bc3b26986b7f0416227\n" }, { "commit": "26017468139ec9736d4752f814fb05f333411d18", "tree": "76806aa337c14d19a1d751789b5ae9a6bf9c096e", "parents": [ "37829f0c71fc7df855e5a28256e136802755022f" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Mon Jan 27 02:37:50 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 05:26:44 2025 +0000" }, "message": "storageproxyd: start early `on post-fs`\n\nstarted on post-fs, before data partition is mounted by vold.\n\nBug: 392488669\nTest: Boot trusty and observe the nice bootflow without\n Vold or Keymint error logs!\nChange-Id: I0e93f58aba6e60fceaef313510d5b48f5cc302b1\n" }, { "commit": "37829f0c71fc7df855e5a28256e136802755022f", "tree": "2e2f03bbe53915515fc8230239d9349609261137", "parents": [ "082f4363a8137eb5decc0f5f90b7d4a3ba32aa07" ], "author": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Jan 21 16:42:03 2025 +0000" }, "committer": { "name": "Armelle Laine", "email": "armellel@google.com", "time": "Tue Feb 04 05:26:35 2025 +0000" }, "message": "add OWNERS file\n\nBug: 392489757\nTest: lunch qemu_trusty_arm64-trunk_staging-userdebug\nChange-Id: I724204aa864b1e074d245f9e66b199d7274f3b1f\n" }, { "commit": "9b13794f34804bc7b728e25d336d6bfcdc2c1314", "tree": "5c81b67bfefec1fe99a91062cbf6fb9624438f05", "parents": [ "4ddf56c107e19b112660cf8b22452022cc72b6d0", "082f4363a8137eb5decc0f5f90b7d4a3ba32aa07" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Mon Feb 03 19:39:09 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 03 19:39:09 2025 -0800" }, "message": "Switch to 6.12 GKI am: 082f4363a8\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3474350\n\nChange-Id: I9e57465c4484b0573c4f188e1e33eeae7546168d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "082f4363a8137eb5decc0f5f90b7d4a3ba32aa07", "tree": "5c81b67bfefec1fe99a91062cbf6fb9624438f05", "parents": [ "81be601ed11d9c11c86c9490c7e56e4776b714ef" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Mon Feb 03 23:14:42 2025 +0000" }, "committer": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Tue Feb 04 00:05:48 2025 +0000" }, "message": "Switch to 6.12 GKI\n\nBug: 393923544\nTest: build.py qemu-generic-arm64-gicv3-test-debug\nChange-Id: If35870aef1d534d1740635f1cfb2e9c049ccffe8\n" }, { "commit": "4ddf56c107e19b112660cf8b22452022cc72b6d0", "tree": "db5bc0cbffa5689c05ea5ff78f38794786e08c94", "parents": [ "3e2cd4bb6d859dcafda773a1788af973102dd6cf", "81be601ed11d9c11c86c9490c7e56e4776b714ef" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Mon Feb 03 14:28:51 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 03 14:28:51 2025 -0800" }, "message": "Add a Microdroid GKI 6.12 kernel am: 81be601ed1\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3472849\n\nChange-Id: I2d7b45e58019f583d4081e9f0e8c5a21fce101b5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "81be601ed11d9c11c86c9490c7e56e4776b714ef", "tree": "db5bc0cbffa5689c05ea5ff78f38794786e08c94", "parents": [ "1f750a8a51b6c814e9d8bb03226f6ab8bcb7512e" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Sun Feb 02 00:37:14 2025 +0000" }, "committer": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Sun Feb 02 00:37:54 2025 +0000" }, "message": "Add a Microdroid GKI 6.12 kernel\n\nBug: 392725856\nTest: Boot Microdroid on Trusty\nChange-Id: Ia49edba692daf9689819bd29f6c64c5c87110056\n" }, { "commit": "3e2cd4bb6d859dcafda773a1788af973102dd6cf", "tree": "19e115949f3524bd95db924d14fc55fef6f88cb3", "parents": [ "13426519b874db75e0d147602103512e3b9e65e6", "1f750a8a51b6c814e9d8bb03226f6ab8bcb7512e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Dec 14 09:11:54 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Dec 14 09:11:54 2024 -0800" }, "message": "Merge \"Update paths to virtio_pci_*_dev modules\" into main am: 1f750a8a51\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3412342\n\nChange-Id: I3c2804f9adc35e8732cf8f0923d8e07e4d165d22\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1f750a8a51b6c814e9d8bb03226f6ab8bcb7512e", "tree": "19e115949f3524bd95db924d14fc55fef6f88cb3", "parents": [ "11014ef2217eb0e9aff67b228663e8ab6ec3c9cd", "0ed9d98a51c20af1b8f139b21b57c1c39381b373" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Dec 14 08:46:11 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Dec 14 08:46:11 2024 -0800" }, "message": "Merge \"Update paths to virtio_pci_*_dev modules\" into main" }, { "commit": "0ed9d98a51c20af1b8f139b21b57c1c39381b373", "tree": "083aba7a81c806c3e29fd5579675408986a5389e", "parents": [ "ab86e6e06f38467c9bba62cfcd0422c73a44d44f" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Sat Dec 14 09:14:59 2024 +0000" }, "committer": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Sat Dec 14 09:14:59 2024 +0000" }, "message": "Update paths to virtio_pci_*_dev modules\n\nThe virtio_pci_legacy_dev and virtio_pci_modern_dev\nwere moved into the GKI. Update their paths here\nand also prevent stripping them so they stay signed.\n\nBug: None\nTest: Boot qemu-generic-arm64-test-debug\nChange-Id: Iec7d8d525f57f66b677ce530268ffa5b68afb331\n" }, { "commit": "13426519b874db75e0d147602103512e3b9e65e6", "tree": "9796a2441eef3e06ae4ec35d6f43656a68235d23", "parents": [ "8c55e32ce49daf79a2caf873f687bbf7dc7cca64", "11014ef2217eb0e9aff67b228663e8ab6ec3c9cd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 19:13:45 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 19:13:45 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: 11014ef221 -s ours\n\nam skip reason: Merged-In Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59 with SHA-1 2e248989d9 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3413719\n\nChange-Id: I4d8ab478d05a092b7d57842d8a56213f684713b2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "11014ef2217eb0e9aff67b228663e8ab6ec3c9cd", "tree": "9796a2441eef3e06ae4ec35d6f43656a68235d23", "parents": [ "ab86e6e06f38467c9bba62cfcd0422c73a44d44f", "8c55e32ce49daf79a2caf873f687bbf7dc7cca64" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:07 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:07 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59\nChange-Id: Iba3b7adea2923359f1713007435d9a10907b4877\n" }, { "commit": "a71da506fb37b3bde26102d682c440fe449ba4c0", "tree": "06d85ba6e9d2e40a77b660aca18c9f2845a3cb39", "parents": [ "55c4f5bb2a5ffb0f052a3ac1e56277e5600e2495", "8c55e32ce49daf79a2caf873f687bbf7dc7cca64" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 25 18:20:01 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 25 18:20:01 2024 +0000" }, "message": "[automerger skipped] Merge \"Merge ab/AP4A.240925.013 into aosp-main-future\" into aosp-main-future am: 8c55e32ce4 -s ours\n\nam skip reason: Merged-In Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59 with SHA-1 2e248989d9 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/generic/trusty/+/29615678\n\nChange-Id: I248a7373950c1fc81798f46c9b096ab97b607f34\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "55c4f5bb2a5ffb0f052a3ac1e56277e5600e2495", "tree": "06d85ba6e9d2e40a77b660aca18c9f2845a3cb39", "parents": [ "55b11be7eb2e702a543bd45c0a947f1b7ab27cfa", "2260ef533085538a76011303196f97d2783fcda1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 25 18:19:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 25 18:19:04 2024 +0000" }, "message": "[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 2260ef5330 -s ours\n\nam skip reason: Merged-In Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59 with SHA-1 2e248989d9 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/generic/trusty/+/30532912\n\nChange-Id: I160a9eacb78516bd7852ca038b42a013f0b2ebba\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8c55e32ce49daf79a2caf873f687bbf7dc7cca64", "tree": "9796a2441eef3e06ae4ec35d6f43656a68235d23", "parents": [ "926e60e2493e92c8e131240ecea67e6f13a8df8f", "2260ef533085538a76011303196f97d2783fcda1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 25 17:28:18 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 25 17:28:18 2024 +0000" }, "message": "Merge \"Merge ab/AP4A.240925.013 into aosp-main-future\" into aosp-main-future" }, { "commit": "55b11be7eb2e702a543bd45c0a947f1b7ab27cfa", "tree": "06d85ba6e9d2e40a77b660aca18c9f2845a3cb39", "parents": [ "6f2ffff0cd66cc74b967561748a94f5d17260f6b", "926e60e2493e92c8e131240ecea67e6f13a8df8f" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Sun Nov 24 20:47:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Nov 24 20:47:24 2024 +0000" }, "message": "Reapply \"Update kernel module paths\" am: ab86e6e06f am: 926e60e249\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3368146\n\nChange-Id: Id352aa0faf1a709b9ba3a9865218b61bda90525a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "926e60e2493e92c8e131240ecea67e6f13a8df8f", "tree": "06d85ba6e9d2e40a77b660aca18c9f2845a3cb39", "parents": [ "5679236c47c2ce8c9da87764176fdc6f6135eab1", "ab86e6e06f38467c9bba62cfcd0422c73a44d44f" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Sun Nov 24 20:01:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Nov 24 20:01:52 2024 +0000" }, "message": "Reapply \"Update kernel module paths\" am: ab86e6e06f\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3368146\n\nChange-Id: Ifaeb5fcb15c7afbcb19238693d5406c13ba13979\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ab86e6e06f38467c9bba62cfcd0422c73a44d44f", "tree": "06d85ba6e9d2e40a77b660aca18c9f2845a3cb39", "parents": [ "c53d6592c4538f01da7279ff3d872c11f4b61d73" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Fri Nov 22 11:38:40 2024 +0100" }, "committer": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Fri Nov 22 17:32:57 2024 +0100" }, "message": "Reapply \"Update kernel module paths\"\n\nThis reverts commit c53d6592c4538f01da7279ff3d872c11f4b61d73.\n\nag/3368559 but posted on its own, as it was reverted because of a\ngoldfish issue in another CL from the same topic (aosp/3367541). It\u0027s\nnot supposed to depend on other CLs from there anyway.\n\nTest: treehugger\nBug: 376629474\nChange-Id: I1aee380ef1fd7b14755b363f3b485ce43ed05228\n" }, { "commit": "6f2ffff0cd66cc74b967561748a94f5d17260f6b", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "2a1249d01c0655474007f3645b92bca723c0dfc6", "5679236c47c2ce8c9da87764176fdc6f6135eab1" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Thu Nov 21 23:40:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 21 23:40:09 2024 +0000" }, "message": "Revert \"Update kernel module paths\" am: c53d6592c4 am: 5679236c47\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3368851\n\nChange-Id: I948b715f21f227bbbb76a1a0cd59e00c7f77b259\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5679236c47c2ce8c9da87764176fdc6f6135eab1", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "f774aeda94e8496bf2a9cf292fa1039f3b7d03e8", "c53d6592c4538f01da7279ff3d872c11f4b61d73" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Thu Nov 21 23:17:14 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 21 23:17:14 2024 +0000" }, "message": "Revert \"Update kernel module paths\" am: c53d6592c4\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3368851\n\nChange-Id: I9f77739a43806d81e20bdfbe4e5b1ed0f1edfdd2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2260ef533085538a76011303196f97d2783fcda1", "tree": "806c1cd3bf5c05614f252f536d13dcff23560905", "parents": [ "6383f5758612d17bc297beed93f84d9f230d85cf", "ded6594f8aa04d31dce4cf21b827675874106183" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Nov 21 15:09:58 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Nov 21 15:09:58 2024 -0800" }, "message": "Merge ab/AP4A.240925.013 into aosp-main-future\n\nBug: 370570306\nMerged-In: Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59\nChange-Id: Ia7a046ccb98e15569c5e9523497d9ef986771643\n" }, { "commit": "c53d6592c4538f01da7279ff3d872c11f4b61d73", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "30236bec32f25547d8d8e1f74cd3b49856414287" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Thu Nov 21 22:48:46 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 21 22:48:51 2024 +0000" }, "message": "Revert \"Update kernel module paths\"\n\nRevert submission 3367721-prebuilts-path-fix-20241120\n\nReason for revert: DroidMonitor: Potential culprit for http://b/380323620 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\n\nReverted changes: /q/submissionid:3367721-prebuilts-path-fix-20241120\n\nChange-Id: I6ea42377a84d94a9ddd44fb92a9c3014d07912f9\n" }, { "commit": "2a1249d01c0655474007f3645b92bca723c0dfc6", "tree": "06d85ba6e9d2e40a77b660aca18c9f2845a3cb39", "parents": [ "60963d0d99c2bb6fc5aa9e59b91d6aa7825e4c14", "f774aeda94e8496bf2a9cf292fa1039f3b7d03e8" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Thu Nov 21 22:20:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 21 22:20:03 2024 +0000" }, "message": "Update kernel module paths am: 30236bec32 am: f774aeda94\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3368559\n\nChange-Id: I6e5d59edb2cddf78e4e76aaf25bd3fb23f3ee1a8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f774aeda94e8496bf2a9cf292fa1039f3b7d03e8", "tree": "06d85ba6e9d2e40a77b660aca18c9f2845a3cb39", "parents": [ "6383f5758612d17bc297beed93f84d9f230d85cf", "30236bec32f25547d8d8e1f74cd3b49856414287" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Thu Nov 21 21:56:00 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 21 21:56:00 2024 +0000" }, "message": "Update kernel module paths am: 30236bec32\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3368559\n\nChange-Id: I06d8bd4d6bb3364096a9ae0c1ed9d82eb242ec54\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "30236bec32f25547d8d8e1f74cd3b49856414287", "tree": "06d85ba6e9d2e40a77b660aca18c9f2845a3cb39", "parents": [ "98aa37dc7cbb79291ba5487c5f44b45cd804a2c1" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Wed Nov 20 20:38:55 2024 +0100" }, "committer": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Thu Nov 21 15:44:05 2024 +0100" }, "message": "Update kernel module paths\n\nRe-applying the change without updating the modules themselves to limit\nthe changes getting reverted on internal build breaks.\n\nThe modules listed here exist under SYSTEM_DLKM_SRC since May 2024.\nHaving the $(wildcard) versions of both SYSTEM_DLKM_SRC and\nKERNEL_MODULES_PATH variants causes \"overriding commands for target\"\nerrors because currently the prebuilts exist under *both* paths.\n\nChanging this to just SYSTEM_DLKM_SRC should work both before and after\nthe prebuilts update, which removes the KERNEL_MODULES_PATH ones.\n\nTest: treehugger\nBug: 376629474\nChange-Id: I6bb7ce14b55b25b370b82a7ab8c15e6f74fce408\n" }, { "commit": "60963d0d99c2bb6fc5aa9e59b91d6aa7825e4c14", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "3300b7a39dec7effe15dc44195d05a86d7191f8a", "6383f5758612d17bc297beed93f84d9f230d85cf" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Wed Nov 20 02:04:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 20 02:04:59 2024 +0000" }, "message": "Revert \"Update kernel modules path\" am: 98aa37dc7c am: 6383f57586\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3366537\n\nChange-Id: I1f2832e8bb9f6ac400e8c1a7ea3dfb91a5b000bb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6383f5758612d17bc297beed93f84d9f230d85cf", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "1d9562feef8d7a75a710dab66eeb6fdeba0d3933", "98aa37dc7cbb79291ba5487c5f44b45cd804a2c1" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Wed Nov 20 01:09:57 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 20 01:09:57 2024 +0000" }, "message": "Revert \"Update kernel modules path\" am: 98aa37dc7c\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3366537\n\nChange-Id: Ifcad2f4171506ce4ee72d8ee673d97efa10ecac8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "98aa37dc7cbb79291ba5487c5f44b45cd804a2c1", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "842eb723d26805f6446d9064264e5c6ae1c3af73" ], "author": { "name": "Liana Kazanova", "email": "lkazanova@google.com", "time": "Tue Nov 19 23:22:23 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 19 23:24:20 2024 +0000" }, "message": "Revert \"Update kernel modules path\"\n\nRevert submission 3360707-update-kernel-prebuilts-20241118\n\nReason for revert: DroidMonitor: Potential culprit for http://b/379929054 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.\n\nReverted changes: /q/submissionid:3360707-update-kernel-prebuilts-20241118\n\nChange-Id: I6d5a665a18ef4e40221cd1ca14d0224de9858dd0\n" }, { "commit": "3300b7a39dec7effe15dc44195d05a86d7191f8a", "tree": "a15ddda282ff1b38856e82da0ea7f30a7dce9c53", "parents": [ "4f09fbf6177739f716e8988d69048ef24562e31e", "1d9562feef8d7a75a710dab66eeb6fdeba0d3933" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Tue Nov 19 20:28:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 19 20:28:40 2024 +0000" }, "message": "Update kernel modules path am: 842eb723d2 am: 1d9562feef\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3360407\n\nChange-Id: Ib4f15de0c5dfbcbaf461ed967084e5bdd0f2349d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1d9562feef8d7a75a710dab66eeb6fdeba0d3933", "tree": "a15ddda282ff1b38856e82da0ea7f30a7dce9c53", "parents": [ "d1e628d2648bfdce237507d6ef6b596326bfe7f9", "842eb723d26805f6446d9064264e5c6ae1c3af73" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Tue Nov 19 19:54:38 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 19 19:54:38 2024 +0000" }, "message": "Update kernel modules path am: 842eb723d2\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3360407\n\nChange-Id: I54665d2173232dc565430f5552d951dbf1794d5f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "842eb723d26805f6446d9064264e5c6ae1c3af73", "tree": "a15ddda282ff1b38856e82da0ea7f30a7dce9c53", "parents": [ "c9d3f8edd71d6cdae8c58a528e605e73cf678422" ], "author": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Mon Nov 18 14:31:46 2024 +0100" }, "committer": { "name": "Marcin Radomski", "email": "dextero@google.com", "time": "Mon Nov 18 15:27:40 2024 +0100" }, "message": "Update kernel modules path\n\nKernel module prebuilts are now dropped under\nkernel/prebuilts/$(TARGET_KERNEL_USE)/$(TARGET_KERNEL_ARCH). Include\nboth possible paths, and use $(wildcard) to ignore the missing entry.\n\nThis should prevent breaks like b/379280031.\n\nTest: treehugger\nTest: lunch qemu_trusty_arm64-trunk_staging-eng \u0026\u0026 m\nBug: 376629474\nChange-Id: I58c4c86ecab5332c0a1b73b8cc9dd3ee23678ea4\n" }, { "commit": "4f09fbf6177739f716e8988d69048ef24562e31e", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "90770e45c23c1c805a097b5e697582dbca2a3874", "d1e628d2648bfdce237507d6ef6b596326bfe7f9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 16 23:57:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 16 23:57:41 2024 +0000" }, "message": "[automerger skipped] Skip 24Q4 in aosp-main-future am: d1e628d264 -s ours\n\nam skip reason: Merged-In Iba6424bc7d97a2825afd5605c7cede6c28cc6f65 with SHA-1 90770e45c2 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/device/generic/trusty/+/29910886\n\nChange-Id: Iffb04e42988b48a8d8268f32803dee48f41d8b97\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d1e628d2648bfdce237507d6ef6b596326bfe7f9", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "9c194d916635712ae873bd7c6bd8c2b59ceb483d", "5072211d572473d5849800196228a2b76d0676d5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 16 14:41:09 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 16 14:41:09 2024 -0700" }, "message": "Skip 24Q4 in aosp-main-future\n\nBug: 373937381\nMerged-In: Iba6424bc7d97a2825afd5605c7cede6c28cc6f65\nChange-Id: I51b82dddf35b9a278e3b3237d7ddf2cce694a0e6\n" }, { "commit": "90770e45c23c1c805a097b5e697582dbca2a3874", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "61a185a6f0ba382b7e546eab0657350976a39f03", "9c194d916635712ae873bd7c6bd8c2b59ceb483d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 03 21:02:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 21:02:46 2024 +0000" }, "message": "Merge \"Revert^2 \"trusty: Add script to repack ramdisk to host package\"\" into main am: c9d3f8edd7 am: 9c194d9166\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3285200\n\nChange-Id: Iba6424bc7d97a2825afd5605c7cede6c28cc6f65\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c194d916635712ae873bd7c6bd8c2b59ceb483d", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "2e8489304ea97f4a05a8d22adca634caaf176268", "c9d3f8edd71d6cdae8c58a528e605e73cf678422" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 03 20:43:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 20:43:29 2024 +0000" }, "message": "Merge \"Revert^2 \"trusty: Add script to repack ramdisk to host package\"\" into main am: c9d3f8edd7\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3285200\n\nChange-Id: Ifd2508f855fc0e691a28fa199a13cb61e2eec848\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9d3f8edd71d6cdae8c58a528e605e73cf678422", "tree": "3016231bfb7140cff42cf5c5bf5d882814088f26", "parents": [ "b5679ca7ed308134df7cd94d2a47390e6233e3cf", "4667d3836e228f9621123ab573dacd197a36220a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 03 20:29:06 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 03 20:29:06 2024 +0000" }, "message": "Merge \"Revert^2 \"trusty: Add script to repack ramdisk to host package\"\" into main" }, { "commit": "61a185a6f0ba382b7e546eab0657350976a39f03", "tree": "806c1cd3bf5c05614f252f536d13dcff23560905", "parents": [ "74cd02623eec6e678e135d36f00325d4a012e964", "2e8489304ea97f4a05a8d22adca634caaf176268" ], "author": { "name": "Andrei Homescu (xWF)", "email": "ahomescu@google.com", "time": "Thu Oct 03 08:18:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 08:18:29 2024 +0000" }, "message": "Revert \"BoardConfig.mk: Add ffa-module.ko\" am: b5679ca7ed am: 2e8489304e\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3290438\n\nChange-Id: Ic48d9b3149dd893f107f2b9b980a273b3479d060\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2e8489304ea97f4a05a8d22adca634caaf176268", "tree": "806c1cd3bf5c05614f252f536d13dcff23560905", "parents": [ "310a783567173230e8a13a4a12e517b02d229c05", "b5679ca7ed308134df7cd94d2a47390e6233e3cf" ], "author": { "name": "Andrei Homescu (xWF)", "email": "ahomescu@google.com", "time": "Thu Oct 03 07:56:00 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 07:56:00 2024 +0000" }, "message": "Revert \"BoardConfig.mk: Add ffa-module.ko\" am: b5679ca7ed\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3290438\n\nChange-Id: I2a4ae42f3ae5c82aab914dd9e5335db8720f86d4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b5679ca7ed308134df7cd94d2a47390e6233e3cf", "tree": "806c1cd3bf5c05614f252f536d13dcff23560905", "parents": [ "afa5e8acb40021200fa0e5e67a47f51bc8a64e15" ], "author": { "name": "Andrei Homescu (xWF)", "email": "ahomescu@google.com", "time": "Thu Oct 03 05:18:12 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 03 05:18:12 2024 +0000" }, "message": "Revert \"BoardConfig.mk: Add ffa-module.ko\"\n\nThis reverts commit afa5e8acb40021200fa0e5e67a47f51bc8a64e15.\n\nReason for revert: Breaks boot\n\nChange-Id: Ib30ac43485828ff0d6015b5f67c234932a14ce76\n" }, { "commit": "74cd02623eec6e678e135d36f00325d4a012e964", "tree": "35bbccd359f6ca031094ee52015a9a09f483b3bd", "parents": [ "3fbae32c9e6446cf76604e8955f2bae29cce2596", "310a783567173230e8a13a4a12e517b02d229c05" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Thu Oct 03 03:29:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 03:29:46 2024 +0000" }, "message": "BoardConfig.mk: Add ffa-module.ko am: afa5e8acb4 am: 310a783567\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3291090\n\nChange-Id: I27ce6c310a5918e24a08694fcc972dd68f4b73d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "310a783567173230e8a13a4a12e517b02d229c05", "tree": "35bbccd359f6ca031094ee52015a9a09f483b3bd", "parents": [ "053743528c7e14ad6dccf86a1cc3b28c1920ddee", "afa5e8acb40021200fa0e5e67a47f51bc8a64e15" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Thu Oct 03 03:06:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 03 03:06:39 2024 +0000" }, "message": "BoardConfig.mk: Add ffa-module.ko am: afa5e8acb4\n\nOriginal change: https://android-review.googlesource.com/c/device/generic/trusty/+/3291090\n\nChange-Id: Ie107058266051e1a6b911148c8559b38afbb0ca8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "afa5e8acb40021200fa0e5e67a47f51bc8a64e15", "tree": "35bbccd359f6ca031094ee52015a9a09f483b3bd", "parents": [ "678c9750dbf76b3d6cd5b47d5155123604bdc849" ], "author": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Thu Oct 03 00:41:03 2024 +0000" }, "committer": { "name": "Andrei Homescu", "email": "ahomescu@google.com", "time": "Thu Oct 03 00:41:03 2024 +0000" }, "message": "BoardConfig.mk: Add ffa-module.ko\n\nBug: None\nTest: m\nChange-Id: Id27a6d3db66852991f427c39cea4d6a55465e6d9\n" }, { "commit": "ded6594f8aa04d31dce4cf21b827675874106183", "tree": "806c1cd3bf5c05614f252f536d13dcff23560905", "parents": [ "cc5600bc68f277049c92ab21121d26d5cc296fa6", "29e98017a044ad84c8bbb419007296c5fef62c49" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Sep 27 21:15:04 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Sep 27 21:15:04 2024 +0000" }, "message": "Merge cherrypicks of [\u0027android-review.googlesource.com/3282255\u0027] into 24Q4-release.\n\nChange-Id: I32e95e02101a2a76a430a811596a0a70901a36de\n" }, { "commit": "29e98017a044ad84c8bbb419007296c5fef62c49", "tree": "806c1cd3bf5c05614f252f536d13dcff23560905", "parents": [ "cc5600bc68f277049c92ab21121d26d5cc296fa6" ], "author": { "name": "Hugo Drumond Jacob", "email": "hugojacob@google.com", "time": "Wed Sep 25 12:34:08 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Sep 27 21:13:33 2024 +0000" }, "message": "Revert \"trusty: Add script to repack ramdisk to host package\"\n\nThis reverts commit a8ced7ee5685386da4fbba3b6acdd27632499c1a.\n\nReason for revert: b/369537629\n(cherry picked from https://android-review.googlesource.com/q/commit:2e248989d99a62d5d730076a1c19b74fc9d069c3)\nMerged-In: Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59\nChange-Id: Ib667aaa8e7c67ed2d20cc9418b52df92f49f5c59\n" } ], "next": "4667d3836e228f9621123ab573dacd197a36220a" }