arc: arcvm: Pass right value for native_bridge
ArcNativeBridgeExperiment means should we use ndk_translation
or houdini for native arm code. native_bridge should always be
a string. Just hard code houdini for now.
BUG=b:139480143
BUG=b:139482562
TEST=manual - Run roblox on ARCVM
Change-Id: If5601d457cacfb5b2cd6f16525cec6edb46b3449
Reviewed-on: https://chromium-review.googlesource.com/1756585
Tested-by: Lepton Wu <lepton@chromium.org>
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Yusuke Sato <yusukes@chromium.org>
diff --git a/arc/vm/launch/arcvm_launch.cc b/arc/vm/launch/arcvm_launch.cc
index 2032e4e..eeba3d5 100644
--- a/arc/vm/launch/arcvm_launch.cc
+++ b/arc/vm/launch/arcvm_launch.cc
@@ -221,14 +221,15 @@
std::vector<std::string> result = {
"androidboot.hardware=bertha",
"androidboot.container=1",
+ // TODO(b/139480143): when ArcNativeBridgeExperiment is enabled, switch
+ // to ndk_translation.
+ "androidboot.native_bridge=libhoudini.so",
StringPrintf("androidboot.dev_mode=%d", is_dev_mode),
StringPrintf("androidboot.disable_runas=%d", !is_dev_mode),
StringPrintf("androidboot.vm=%d", is_inside_vm),
// TODO(cmtm): get this from arc-setup config or equivalent
"androidboot.debuggable=1",
"androidboot.lcd_density=" + lcd_density,
- StringPrintf("androidboot.native_bridge=%d",
- features.IsEnabled("ArcNativeBridgeExperiment")),
StringPrintf("androidboot.arc_file_picker=%d",
features.IsEnabled("ArcFilePickerExperiment")),
StringPrintf(