commit 5dc7499d52a25b6d330c13c22f6fa85cd35d83af
author Nikita Ioffe <ioffe@google.com> Thu Mar 20 15:49:33 2025 +0000
committer Nikita Ioffe <ioffe@google.com> Thu Mar 20 15:49:33 2025 +0000
tree e2e99707813a7f649627347bea6d4ab7711c3f3a
parent 6765d4b86bda11d75e9c2446f4c55238ee58cdda

Merge canned_fs_config and canned_fs_config_sys_nice

The corresponding RELEASE_AVF_ENABLE_VIRT_CPUFREQ flag was released last
year.

Bug: 404820976
Bug: 391774181
Test: getcap /apex/com.android.virt/bin/virtmgr
Test: getcap /apex/com.android.virt/bin/crosvm
Change-Id: I48d064247d0fd14b0c2efad755a9883c03667055

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 8934de0..39385cb 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -68,10 +68,7 @@
         default: [],
     }),
 
-    canned_fs_config: select(release_flag("RELEASE_AVF_ENABLE_VIRT_CPUFREQ"), {
-        true: "canned_fs_config_sys_nice",
-        default: "canned_fs_config",
-    }),
+    canned_fs_config: "canned_fs_config",
 }
 
 vintf_fragment {