Commit a3ca9351 authored by pkotwicz's avatar pkotwicz Committed by Commit bot

[Reland] [Android] Set enable_remoting=true by default

We set enable_remoting=true in the command line on the official builders. Set
enable_remoting=true as the default on Chromium as well.

BUG=544298
R=lambroslambrou
TBR=dpranke

Review URL: https://codereview.chromium.org/1635373002

Cr-Commit-Position: refs/heads/master@{#371834}
parent c1743467
...@@ -75,7 +75,7 @@ declare_args() { ...@@ -75,7 +75,7 @@ declare_args() {
enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos) enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos)
enable_remoting = !is_ios && !is_android && !is_chromecast && !is_headless enable_remoting = !is_ios && !is_chromecast && !is_headless
# Enable hole punching for the protected video. # Enable hole punching for the protected video.
enable_video_hole = is_android enable_video_hole = is_android
......
...@@ -97,17 +97,19 @@ remoting_android_client_java_tmpl("remoting_android_client_java") { ...@@ -97,17 +97,19 @@ remoting_android_client_java_tmpl("remoting_android_client_java") {
remoting_google_play_services_library = google_play_services_library remoting_google_play_services_library = google_play_services_library
} }
action("remoting_cardboard_extract_native_lib") { if (target_cpu == "arm") {
script = "//remoting/tools/extract_android_native_lib.py" action("remoting_cardboard_extract_native_lib") {
sources = [ script = "//remoting/tools/extract_android_native_lib.py"
"//third_party/cardboard-java/src/CardboardSample/libs/cardboard.jar", sources = [
] "//third_party/cardboard-java/src/CardboardSample/libs/cardboard.jar",
outputs = [ ]
"$root_out_dir/libvrtoolkit.so", outputs = [
] "$root_out_dir/libvrtoolkit.so",
args = [ android_app_abi ] ]
args += rebase_path(sources, root_build_dir) args = [ android_app_abi ]
args += rebase_path(outputs, root_build_dir) args += rebase_path(sources, root_build_dir)
args += rebase_path(outputs, root_build_dir)
}
} }
remoting_apk_tmpl("remoting_apk") { remoting_apk_tmpl("remoting_apk") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment