| Index: android_webview/android_webview.gyp
|
| diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
|
| index 215c640ab3ddb2dcc42dc10409ce325a4fbbc98f..1a1dc7b71175a0365a7bada5a3b18236fb788d29 100644
|
| --- a/android_webview/android_webview.gyp
|
| +++ b/android_webview/android_webview.gyp
|
| @@ -230,8 +230,6 @@
|
| '../v8/tools/gyp/v8.gyp:v8',
|
| 'android_webview_pak',
|
| 'android_webview_version',
|
| - '../components/components.gyp:policy',
|
| - '../components/components.gyp:policy_component',
|
| '../components/components.gyp:pref_registry',
|
| '../components/url_formatter/url_formatter.gyp:url_formatter',
|
| ],
|
| @@ -388,6 +386,14 @@
|
| 'renderer/print_render_frame_observer.cc',
|
| 'renderer/print_render_frame_observer.h',
|
| ],
|
| + 'conditions': [
|
| + ['configuration_policy==1', {
|
| + 'dependencies': [
|
| + '../components/components.gyp:policy',
|
| + '../components/components.gyp:policy_component',
|
| + ],
|
| + }],
|
| + ],
|
| },
|
| {
|
| 'target_name': 'libwebviewchromium',
|
| @@ -403,7 +409,6 @@
|
| '../android_webview/native/webview_native.gyp:android_webview_aw_permission_request_resource',
|
| '../components/components.gyp:external_video_surface_java',
|
| '../components/components.gyp:navigation_interception_java',
|
| - '../components/components.gyp:policy_java',
|
| '../components/components.gyp:web_contents_delegate_android_java',
|
| '../content/content.gyp:content_java',
|
| '../ui/android/ui_android.gyp:ui_java',
|
| @@ -417,6 +422,13 @@
|
| 'R_package_relpath': 'org/chromium/android_webview',
|
| 'android_manifest_path': '../android_webview/apk/java/AndroidManifest.xml', # for lint
|
| },
|
| + 'conditions': [
|
| + ['configuration_policy==1', {
|
| + 'dependencies': [
|
| + '../components/components.gyp:policy_java',
|
| + ],
|
| + }],
|
| + ],
|
| 'includes': [ '../build/java.gypi' ],
|
| },
|
| {
|
|
|