diff options
| author | hush <hush@chromium.org> | 2015-02-26 10:58:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-26 18:59:43 +0000 |
| commit | 683d3ba7de29ff2a85b842db2c03faafcc128787 (patch) | |
| tree | 9459f37b7b0fb291b84d014464621c6fb119926b /android_webview/lib | |
| parent | 82fb05447756b104d3bd2e654195784cb281bc8c (diff) | |
| download | chromium_src-683d3ba7de29ff2a85b842db2c03faafcc128787.zip chromium_src-683d3ba7de29ff2a85b842db2c03faafcc128787.tar.gz chromium_src-683d3ba7de29ff2a85b842db2c03faafcc128787.tar.bz2 | |
Revert of Revert of Add AwAssets into android_webview/native/public (patchset #1 id:1 of https://codereview.chromium.org/947113002/)
Reason for revert:
https://codereview.chromium.org/950973003/ is just landed to fix the deps problem.
Original issue's description:
> 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
>
> Committed: https://crrev.com/34cd1a9f17f7b4509753b0184e7ac3463ab43d13
> Cr-Commit-Position: refs/heads/master@{#317567}
TBR=boliu@chromium.org,sgurun@chromium.org,binjin@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=459779
Review URL: https://codereview.chromium.org/957423002
Cr-Commit-Position: refs/heads/master@{#318274}
Diffstat (limited to 'android_webview/lib')
| -rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index 5a24c0f..b96f208 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -9,13 +9,13 @@ #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" #include "android_webview/crash_reporter/aw_microdump_crash_reporter.h" #include "android_webview/lib/aw_browser_dependency_factory_impl.h" -#include "android_webview/native/aw_assets.h" #include "android_webview/native/aw_media_url_interceptor.h" #include "android_webview/native/aw_message_port_service_impl.h" #include "android_webview/native/aw_quota_manager_bridge_impl.h" #include "android_webview/native/aw_web_contents_view_delegate.h" #include "android_webview/native/aw_web_preferences_populater_impl.h" #include "android_webview/native/external_video_surface_container_impl.h" +#include "android_webview/native/public/aw_assets.h" #include "android_webview/renderer/aw_content_renderer_client.h" #include "base/command_line.h" #include "base/cpu.h" |