diff options
| author | binjin <binjin@chromium.org> | 2015-02-23 03:21:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-23 11:21:42 +0000 |
| commit | 34cd1a9f17f7b4509753b0184e7ac3463ab43d13 (patch) | |
| tree | 925659decabce33e7047d0402cb6969dce23f770 /android_webview/native/webview_native.gyp | |
| parent | f06ba4746099cf5ad3c381e9cbdfa66c1aa26c1b (diff) | |
| download | chromium_src-34cd1a9f17f7b4509753b0184e7ac3463ab43d13.zip chromium_src-34cd1a9f17f7b4509753b0184e7ac3463ab43d13.tar.gz chromium_src-34cd1a9f17f7b4509753b0184e7ac3463ab43d13.tar.bz2 | |
Revert of Add AwAssets into android_webview/native/public (patchset #4 id:70009 of https://codereview.chromium.org/937863003/)
Reason for revert:
Suspected to cause 'checkdeps' failures on Linux bot:
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/20990/steps/checkdeps/logs/stdio
ERROR in /mnt/data/b/build/slave/Linux_Tests/build/src/android_webview/browser/aw_dev_tools_manager_delegate.cc
Illegal include: "android_webview/native/aw_contents.h"
Because of "-android_webview" from android_webview/browser's include_rules.
Original issue's description:
> Add AwAssets into android_webview/native/public
>
> This is done so that android_webview/browser doesn't need to depend on
> android_webview/native
>
> BUG=459779
>
> Committed: https://crrev.com/a08360b39730751c5f85797bdff5b748d907c11a
> Cr-Commit-Position: refs/heads/master@{#317475}
TBR=boliu@chromium.org,sgurun@chromium.org,hush@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=459779
Review URL: https://codereview.chromium.org/947113002
Cr-Commit-Position: refs/heads/master@{#317567}
Diffstat (limited to 'android_webview/native/webview_native.gyp')
| -rw-r--r-- | android_webview/native/webview_native.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp index 121a876..34889e1 100644 --- a/android_webview/native/webview_native.gyp +++ b/android_webview/native/webview_native.gyp @@ -36,6 +36,8 @@ 'android_protocol_handler.h', 'android_webview_jni_registrar.cc', 'android_webview_jni_registrar.h', + 'aw_assets.cc', + 'aw_assets.h', 'aw_autofill_client.cc', 'aw_autofill_client.h', 'aw_browser_dependency_factory.cc', @@ -95,8 +97,6 @@ 'permission/permission_request_handler_client.h', 'permission/simple_permission_request.cc', 'permission/simple_permission_request.h', - 'public/aw_assets.cc', - 'public/aw_assets.h', 'state_serializer.cc', 'state_serializer.h', ], |