diff options
| author | mikecase <mikecase@chromium.org> | 2016-03-21 14:18:05 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-21 21:19:03 +0000 |
| commit | 49971fcb594aaa7181e001b3111cd3bf6410fb67 (patch) | |
| tree | 0bba6aa85cbec611e3cb289ef51c3d1b31c55950 /build | |
| parent | a50f9840749052fbdec087a304548217cc6fd00b (diff) | |
| download | chromium_src-49971fcb594aaa7181e001b3111cd3bf6410fb67.zip chromium_src-49971fcb594aaa7181e001b3111cd3bf6410fb67.tar.gz chromium_src-49971fcb594aaa7181e001b3111cd3bf6410fb67.tar.bz2 | |
[WebView] Reorganize all of the WebView Shell apks into their own dir.
Thought I could clean up the android_webview/tools dir a little bit.
It basically has some random tools as well as the WebViewShell apks
so I moved all the apks into a shared folder.
- Moved all WebViewShell Apks into tools/system_webview_shell
- Moved WebViewShell/test/ to system_webview_shell/test/data/ to better
match the naming of test data elsewhere
- Removed DEPRECATED_java_in_dir from tools/BUILD.gn.
- Updated gn_migration.gypi since GN targets exist for the WebView
Shell apks.
BUG=
Review URL: https://codereview.chromium.org/1785283005
Cr-Commit-Position: refs/heads/master@{#382390}
Diffstat (limited to 'build')
| -rw-r--r-- | build/gn_migration.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index bbbce06..df3b52c 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -253,6 +253,9 @@ }], ['OS=="android" and chromecast==0', { 'dependencies': [ + '../android_webview/android_webview_shell.gyp:system_webview_shell_apk', + '../android_webview/android_webview_shell.gyp:system_webview_shell_layout_test_apk', + '../android_webview/android_webview_shell.gyp:system_webview_shell_page_cycler_apk', '../chrome/android/chrome_apk.gyp:chrome_public_apk', '../chrome/android/chrome_apk.gyp:chrome_public_test_apk', '../chrome/android/chrome_apk.gyp:chrome_sync_shell_apk', @@ -766,9 +769,6 @@ '../android_webview/android_webview.gyp:android_webview_test_apk', '../android_webview/android_webview.gyp:android_webview_unittests', '../android_webview/android_webview.gyp:android_webview_unittests_apk', - '../android_webview/android_webview_shell.gyp:system_webview_shell_apk', - '../android_webview/android_webview_shell.gyp:system_webview_shell_layout_test_apk', - '../android_webview/android_webview_shell.gyp:system_webview_shell_page_cycler_apk', ], }], ['OS=="android" and chromecast==0 and use_webview_internal_framework==0', { |