diff options
| author | lambroslambrou <lambroslambrou@chromium.org> | 2016-01-26 13:35:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-26 21:38:00 +0000 |
| commit | 0e1b88f24b66c785568a065675d88d1e128ef99b (patch) | |
| tree | 068f523a271e5f896768aeb98cd5dd6fcae8583c /remoting | |
| parent | a6300110b905d4201f69fa7a9894c3abf2eb9d9d (diff) | |
| download | chromium_src-0e1b88f24b66c785568a065675d88d1e128ef99b.zip chromium_src-0e1b88f24b66c785568a065675d88d1e128ef99b.tar.gz chromium_src-0e1b88f24b66c785568a065675d88d1e128ef99b.tar.bz2 | |
Fix enable_cardboard/enable_cast for GN build of remoting/android.
This makes the settings into proper GN args that can be overridden.
Also added "remoting" to their names since they are remoting-specific.
Also fixed the Cardboard-enabled build (code was expecting '1'/'0' but
GN was supplying 'true'/'false').
Review URL: https://codereview.chromium.org/1637093002
Cr-Commit-Position: refs/heads/master@{#371602}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/android/BUILD.gn | 6 | ||||
| -rw-r--r-- | remoting/android/client_java_tmpl.gni | 2 | ||||
| -rw-r--r-- | remoting/remoting_options.gni | 12 |
3 files changed, 12 insertions, 8 deletions
diff --git a/remoting/android/BUILD.gn b/remoting/android/BUILD.gn index a933e3d..9653def 100644 --- a/remoting/android/BUILD.gn +++ b/remoting/android/BUILD.gn @@ -70,7 +70,11 @@ remoting_localize("remoting_apk_manifest") { "java/AndroidManifest.xml.jinja2", ] locales = [ "en" ] - defines = [ "ENABLE_CARDBOARD=$enable_cardboard" ] + if (remoting_enable_cardboard) { + defines = [ "ENABLE_CARDBOARD=1" ] + } else { + defines = [ "ENABLE_CARDBOARD=0" ] + } variables = [ branding_path ] output = "$root_gen_dir/remoting/android/{{source_name_part}}" } diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni index 91ef261..aab3f02 100644 --- a/remoting/android/client_java_tmpl.gni +++ b/remoting/android/client_java_tmpl.gni @@ -10,7 +10,7 @@ template("remoting_android_client_java_tmpl") { DEPRECATED_java_in_dir = "//remoting/android/java/src" java_files = [] - if (enable_cast) { + if (remoting_enable_cast) { java_files += [ "//remoting/android/cast/src/org/chromium/chromoting/CastExtensionHandler.java" ] } diff --git a/remoting/remoting_options.gni b/remoting/remoting_options.gni index 0cf8f29..0dcd4c9 100644 --- a/remoting/remoting_options.gni +++ b/remoting/remoting_options.gni @@ -11,17 +11,17 @@ declare_args() { # Set this to enable building internal AppRemoting apps. enable_internal_app_remoting_targets = false -} -# Set this to enable cast mode on the android client. -enable_cast = false + # Set this to enable cast mode on the android client. + remoting_enable_cast = false + + # Set this to enable Android Chromoting Cardboard Activity. + remoting_enable_cardboard = false +} # Set this to use GCD instead of the remoting directory service. remoting_use_gcd = 0 -# Set this to enable Android Chromoting Cardboard Activity. -enable_cardboard = false - # Enable the multi-process host on Windows by default. if (is_win) { remoting_multi_process = 1 |