diff options
| author | the_jk <the_jk@opera.com> | 2015-10-20 12:19:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 19:21:18 +0000 |
| commit | 911ca660c71ffcf651e979e5585f783ad8d7fcd3 (patch) | |
| tree | c19a9bb16b1447ff6151446e1bf5192790c4cecd /android_webview/android_webview.gyp | |
| parent | 54a3e6233063c0f77a1a04091971df9f908de0e6 (diff) | |
| download | chromium_src-911ca660c71ffcf651e979e5585f783ad8d7fcd3.zip chromium_src-911ca660c71ffcf651e979e5585f783ad8d7fcd3.tar.gz chromium_src-911ca660c71ffcf651e979e5585f783ad8d7fcd3.tar.bz2 | |
Fix gyp/gn with configuration_policy=0
Running gyp in chromium with configuration_policy set to 0 fails as
multiple targets that are behind condition of configuration_policy==1
are referenced without corresponding conditionals
BUG=530579
Review URL: https://codereview.chromium.org/1414583004
Cr-Commit-Position: refs/heads/master@{#355128}
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 215c640..1a1dc7b 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' ], }, { |