Merge changes I6dbe8c43,I7c347313 into main
* changes:
virtualizationmanager: Prevent tests from using debug policy
virtualizationmanager: Remove bad test
diff --git a/java/framework/Android.bp b/java/framework/Android.bp
index 32b2aee..26ea214 100644
--- a/java/framework/Android.bp
+++ b/java/framework/Android.bp
@@ -43,4 +43,7 @@
impl_library_visibility: [
"//packages/modules/Virtualization:__subpackages__",
],
+ aconfig_declarations: [
+ "avf_aconfig_flags",
+ ],
}
diff --git a/virtualizationmanager/src/debug_config.rs b/virtualizationmanager/src/debug_config.rs
index 39097e0..451d1c6 100644
--- a/virtualizationmanager/src/debug_config.rs
+++ b/virtualizationmanager/src/debug_config.rs
@@ -213,7 +213,6 @@
self.debug_level != DebugLevel::NONE || self.debug_policy_ramdump
}
- // TODO: Remove this code path in user build for removing libfdt depenency.
fn from_custom_debug_overlay_policy(debug_level: DebugLevel, path: &Path) -> Result<Self> {
match OwnedFdt::from_overlay_onto_new_fdt(path) {
Ok(fdt) => Ok(Self {