diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-12-30 10:59:01 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-30 18:59:43 +0000 |
| commit | d66326c14bb70a1d61d75b096a9a344bc9a53c1a (patch) | |
| tree | f0c77a4a7513b2c0296ff8dcc46ed452b25aed28 | |
| parent | a96b7d399aaa591595df7e6d6b007d625c5cf7b9 (diff) | |
| download | chromium_src-d66326c14bb70a1d61d75b096a9a344bc9a53c1a.zip chromium_src-d66326c14bb70a1d61d75b096a9a344bc9a53c1a.tar.gz chromium_src-d66326c14bb70a1d61d75b096a9a344bc9a53c1a.tar.bz2 | |
Move webview_framework_jar to config.gni
As the counterpart of android_sdk_jar, move webview_framework_jar
to config.gni, so it is easy to be overriden in downstream.
BUG=565532
Review URL: https://codereview.chromium.org/1554693002
Cr-Commit-Position: refs/heads/master@{#367167}
| -rw-r--r-- | android_webview/glue/BUILD.gn | 2 | ||||
| -rw-r--r-- | build/config/android/config.gni | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/android_webview/glue/BUILD.gn b/android_webview/glue/BUILD.gn index 76e6f51..7cf6270 100644 --- a/android_webview/glue/BUILD.gn +++ b/android_webview/glue/BUILD.gn @@ -11,7 +11,7 @@ webview_framework_ijar = "$root_out_dir/lib.java/webview/frameworks.interface.jar" generate_interface_jar("framework_ijar") { - input_jar = "../../third_party/android_platform/webview/frameworks_6.0.jar" + input_jar = webview_framework_jar output_jar = webview_framework_ijar } diff --git a/build/config/android/config.gni b/build/config/android/config.gni index ec2c0ac..2b5bb71 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -40,6 +40,11 @@ if (is_android) { "//third_party/android_tools:google_play_services_default_resources" } + if (!defined(webview_framework_jar)) { + webview_framework_jar = + "//third_party/android_platform/webview/frameworks_6.0.jar" + } + declare_args() { android_sdk_root = default_android_sdk_root android_sdk_version = default_android_sdk_version |