Merge "Demote Lint FlaggedApi violations to warnings" into main
diff --git a/ferrochrome_app/custom_vm_setup.rc b/ferrochrome_app/custom_vm_setup.rc
index f4244b7..68f370e 100644
--- a/ferrochrome_app/custom_vm_setup.rc
+++ b/ferrochrome_app/custom_vm_setup.rc
@@ -14,10 +14,10 @@
service custom_vm_setup /system_ext/bin/custom_vm_setup
user shell
- group shell
+ group shell media_rw
disabled
oneshot
seclabel u:r:shell:s0
on property:debug.custom_vm_setup.start=true
- start custom_vm_setup
\ No newline at end of file
+ start custom_vm_setup
diff --git a/ferrochrome_app/custom_vm_setup.sh b/ferrochrome_app/custom_vm_setup.sh
index 92a23a3..f007f6a 100644
--- a/ferrochrome_app/custom_vm_setup.sh
+++ b/ferrochrome_app/custom_vm_setup.sh
@@ -2,12 +2,13 @@
function copy_files() {
cp -u /sdcard/vm_config.json /data/local/tmp
+ cp -u /data/media/10/vm_config.json /data/local/tmp
cp -u /sdcard/chromiumos_test_image.bin /data/local/tmp
+ cp -u /data/media/10/chromiumos_test_image.bin /data/local/tmp
chmod 666 /data/local/tmp/vm_config.json
chmod 666 /data/local/tmp/chromiumos_test_image.bin
}
setprop debug.custom_vm_setup.done false
copy_files
-pm grant com.google.android.virtualization.vmlauncher android.permission.USE_CUSTOM_VIRTUAL_MACHINE
setprop debug.custom_vm_setup.start false
-setprop debug.custom_vm_setup.done true
\ No newline at end of file
+setprop debug.custom_vm_setup.done true
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index ff17ed1..c6d6090 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -395,12 +395,9 @@
// python -c "import hashlib; print(hashlib.sha256(b'bootloader').hexdigest())"
bootloader_salt = "3b4a12881d11f33cff968a24d7c53723a8232cde9a8d91e29fdbd6a95ae6adf0"
-// Note that keys can be different for filesystem images even though we're using the same key
-// for microdroid. However, the key signing VBmeta should match with the pubkey embedded in
-// bootloader.
filegroup {
name: "microdroid_sign_key",
- srcs: [":avb_testkey_rsa4096"],
+ srcs: [":pvmfw_embedded_key"],
}
soong_config_module_type {
diff --git a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
index c33d3f5..b646ea1 100644
--- a/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
+++ b/tests/benchmark/src/java/com/android/microdroid/benchmark/MicrodroidBenchmarks.java
@@ -785,6 +785,7 @@
VirtualMachineConfig config =
newVmConfigBuilderWithPayloadBinary("MicrodroidTestNativeLib.so")
.setDebugLevel(DEBUG_LEVEL_NONE)
+ .setShouldBoostUclamp(true)
.setShouldUseHugepages(true)
.build();