diff options
| author | brettw <brettw@chromium.org> | 2015-04-06 12:54:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-06 20:04:52 +0000 |
| commit | b3c7880dc9e66ff449b23e2273b4f20abecba442 (patch) | |
| tree | 924b5677b9c0e1fbaa7387d1c9d34a68c0c957af /ppapi | |
| parent | 318e9c81d83a6862634b87b28e91fa1d4c4f8726 (diff) | |
| download | chromium_src-b3c7880dc9e66ff449b23e2273b4f20abecba442.zip chromium_src-b3c7880dc9e66ff449b23e2273b4f20abecba442.tar.gz chromium_src-b3c7880dc9e66ff449b23e2273b4f20abecba442.tar.bz2 | |
Work on Windows GN component build.
This makes ppapi_shared link. This required many changes to gpu to match the structure of GYP in both component and non-component modes.
BUG=470212
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
Review URL: https://codereview.chromium.org/1053203003
Cr-Commit-Position: refs/heads/master@{#323937}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/BUILD.gn | 16 | ||||
| -rw-r--r-- | ppapi/shared_impl/BUILD.gn | 2 | ||||
| -rw-r--r-- | ppapi/thunk/BUILD.gn | 14 |
3 files changed, 28 insertions, 4 deletions
diff --git a/ppapi/proxy/BUILD.gn b/ppapi/proxy/BUILD.gn index 4af9bdc..31a0262 100644 --- a/ppapi/proxy/BUILD.gn +++ b/ppapi/proxy/BUILD.gn @@ -272,7 +272,7 @@ component("proxy") { "//ipc", "//media:shared_memory_support", "//ppapi/c", - "//ppapi/proxy:ipc", + "//ppapi/proxy:ipc_sources", "//ppapi/shared_impl", "//third_party/icu", ] @@ -293,7 +293,19 @@ component("proxy") { } } -source_set("ipc") { +group("ipc") { + if (is_component_build) { + public_deps = [ + "//ppapi/proxy", + ] + } else { + public_deps = [ + ":ipc_sources", + ] + } +} + +source_set("ipc_sources") { sources = [ "nacl_message_scanner.cc", "nacl_message_scanner.h", diff --git a/ppapi/shared_impl/BUILD.gn b/ppapi/shared_impl/BUILD.gn index 59f4ec0..64ae537 100644 --- a/ppapi/shared_impl/BUILD.gn +++ b/ppapi/shared_impl/BUILD.gn @@ -156,7 +156,7 @@ component("shared_impl") { defines = [ "PPAPI_SHARED_IMPLEMENTATION", - # This target also implements some thunk functions. + # This target goes in the same library as thunk (in GYP they are the same). "PPAPI_THUNK_IMPLEMENTATION", ] diff --git a/ppapi/thunk/BUILD.gn b/ppapi/thunk/BUILD.gn index 5b326e4..18096a4 100644 --- a/ppapi/thunk/BUILD.gn +++ b/ppapi/thunk/BUILD.gn @@ -3,6 +3,12 @@ # found in the LICENSE file. source_set("thunk") { + # In GYP this is the same target as shared_impl. In GN these are split apart + # for clarity but to get component builds correct, targets must only depend + # on these via the shared_impl component. + # TODO(brettw) separate these when GYP compat is no longer required. + visibility = [ "//ppapi/shared_impl" ] + sources = [ "enter.cc", "enter.h", @@ -189,5 +195,11 @@ source_set("thunk") { ] } - defines = [ "PPAPI_THUNK_IMPLEMENTATION" ] + defines = [ + # This target goes in the same library as shared_impl (in GYP they are the + # same). + "PPAPI_SHARED_IMPLEMENTATION", + + "PPAPI_THUNK_IMPLEMENTATION", + ] } |