diff options
| author | hjd <hjd@chromium.org> | 2014-09-09 04:44:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 11:51:25 +0000 |
| commit | aefb27936dcf9694777440b8a2752b3c12300520 (patch) | |
| tree | 686913cdc572c4d648fb31c2a650cbfc129edf52 /build | |
| parent | b73e07836a96661fdf6d599d0f73f4486c603dcb (diff) | |
| download | chromium_src-aefb27936dcf9694777440b8a2752b3c12300520.zip chromium_src-aefb27936dcf9694777440b8a2752b3c12300520.tar.gz chromium_src-aefb27936dcf9694777440b8a2752b3c12300520.tar.bz2 | |
Make the WebView apk build in the Chrome tree
We checkout the Android WebView glue layer (frameworks/webview)
into a new third_party directory (android_webview_glue)
which is checked out via gclient.
This is built against a jar containing frameworks/base
(in android_platform/webview/frameworks.jar).
We have to work around a few other issues:
- Change build/java_apk.gypi to bypass the hardcoded
'src' path.
- Move libwebviewchromium to an include so we can make both
the prefixed and un-prefixed version in the same build.
BUG=391488
R=mkosiba@chromium.org
Review URL: https://codereview.chromium.org/477903003
Cr-Commit-Position: refs/heads/master@{#293921}
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 1 | ||||
| -rw-r--r-- | build/java_apk.gypi | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 7e88a1e..b888d92 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -52,6 +52,7 @@ '<@(android_app_targets)', 'android_builder_tests', '../android_webview/android_webview.gyp:android_webview_apk', + '../android_webview/android_webview.gyp:system_webview_apk', '../android_webview/android_webview_telemetry_shell.gyp:android_webview_telemetry_shell_apk', '../chrome/chrome.gyp:chrome_shell_apk', '../chrome/chrome.gyp:chrome_sync_shell_apk', diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 4f73605..f323853 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -56,6 +56,9 @@ # code. This allows a test APK to inject a Linker.TestRunner instance at # runtime. Should only be used by the chromium_linker_test_apk target!! # never_lint - Set to 1 to not run lint on this target. +# java_in_dir_suffix - To override the /src suffix on java_in_dir. +# app_manifest_version_name - set the apps 'human readable' version number. +# app_manifest_version_code - set the apps version number. { 'variables': { 'tested_apk_obfuscated_jar_path%': '/', @@ -99,6 +102,7 @@ 'lint_result': '<(intermediate_dir)/lint_result.xml', 'lint_config': '<(intermediate_dir)/lint_config.xml', 'never_lint%': 0, + 'java_in_dir_suffix%': '/src', 'instr_stamp': '<(intermediate_dir)/instr.stamp', 'jar_stamp': '<(intermediate_dir)/jar.stamp', 'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp', @@ -605,7 +609,7 @@ # Java files instead of using find. (As is, this will be broken if two # targets use the same java_in_dir and both use java_apk.gypi or # both use java.gypi.) - 'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java" # apk)'], + 'java_sources': ['>!@(find >(java_in_dir)>(java_in_dir_suffix) >(additional_src_dirs) -name "*.java" # apk)'], }, 'inputs': [ @@ -657,7 +661,7 @@ { 'variables': { 'src_dirs': [ - '<(java_in_dir)/src', + '<(java_in_dir)<(java_in_dir_suffix)', '>@(additional_src_dirs)', ], 'lint_jar_path': '<(jar_path)', |