diff options
| author | lambroslambrou <lambroslambrou@chromium.org> | 2015-06-24 16:28:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 23:29:26 +0000 |
| commit | 6dd51554c5c0c8378096aa47b04baf5b5c004560 (patch) | |
| tree | a1c198fdd229f271d3e65ae5f739028210cbc7fa /remoting/remoting_android.gypi | |
| parent | 3c95a0862330163d37b11624013e7bfe72c4d5f2 (diff) | |
| download | chromium_src-6dd51554c5c0c8378096aa47b04baf5b5c004560.zip chromium_src-6dd51554c5c0c8378096aa47b04baf5b5c004560.tar.gz chromium_src-6dd51554c5c0c8378096aa47b04baf5b5c004560.tar.bz2 | |
Chromoting Android: Add Credits screen.
This also slightly changes the behavior of the embedded WebView. Now it
only renders content inline if it originates from the initial host that
it was told to use (otherwise it launches an external browser). This
simplifies the code (by using a single explicitly-defined
WebViewClient implementation).
BUG=499478
Review URL: https://codereview.chromium.org/1202523007
Cr-Commit-Position: refs/heads/master@{#336030}
Diffstat (limited to 'remoting/remoting_android.gypi')
| -rw-r--r-- | remoting/remoting_android.gypi | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi index b6d77c8..b4a52f1 100644 --- a/remoting/remoting_android.gypi +++ b/remoting/remoting_android.gypi @@ -41,6 +41,24 @@ ], }, # end of target 'remoting_client_jni' { + 'target_name': 'remoting_android_resources', + 'type': 'none', + 'copies': [ + { + 'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/raw', + 'files': [ + '<(SHARED_INTERMEDIATE_DIR)/remoting/credits.html', + 'webapp/base/html/credits_css.css', + 'webapp/base/html/main.css', + 'webapp/base/js/credits_js.js', + ], + }, + ], + 'dependencies': [ + 'remoting_credits', + ], + }, # end of target 'remoting_android_resources' + { 'target_name': 'remoting_apk_manifest', 'type': 'none', 'sources': [ @@ -79,6 +97,7 @@ ], }, 'dependencies': [ + 'remoting_android_resources', '../base/base.gyp:base_java', '../ui/android/ui_android.gyp:ui_java', '../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib', |