commit a07b0b0fa812a609ebc22a5b4c827dfd8dc1f964
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Aug 24 01:23:49 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Aug 24 01:23:49 2024 +0000
tree 59cdae10eccab4b3ab3f8b876b0018d19555d7e4
parent 1919f6b4d1979a1da395bb14531ec3490e6b98e2
parent d1b6897f7c4a43c2cdb04aa9884b413903a59f67

Snap for 12272146 from d1b6897f7c4a43c2cdb04aa9884b413903a59f67 to 24Q4-release

Change-Id: Ief069a1df09fb4db2c5dfb7107a906e5337d38cb

fs_mgr/libsnapshot/snapuserd/Android.bp

diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index efbcb5a..9e14156 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -248,7 +248,7 @@
     defaults: ["snapuserd_test_defaults"],
     host_supported: true,
     test_suites: [
-        "device-tests",
+        "general-tests",
     ],
     test_options: {
         test_runner_options: [

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 7b2b96a..63e3d06 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -103,7 +103,7 @@
 
     # Mix device-specific information into the entropy pool
     copy /proc/cmdline /dev/urandom
-    copy /system/etc/prop.default /dev/urandom
+    copy /proc/bootconfig /dev/urandom
 
     symlink /proc/self/fd/0 /dev/stdin
     symlink /proc/self/fd/1 /dev/stdout