Skip to content

Commit

Permalink
Support the Starboard porting layer
Browse files Browse the repository at this point in the history
For Starboard targets, depend on Starbord rather than POSIX Emulation.

b/23755473

Change-Id: Ibe92f72ae44457d371fd1feecd4ffde9f616953e
  • Loading branch information
Cobalt Team authored and briantting committed Sep 3, 2015
1 parent ae047b5 commit 543b692
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 8 deletions.
14 changes: 12 additions & 2 deletions base/base.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,16 @@
# toolset can be host or target.
# (host in the case of e.g. protobuf compiler.)
# We only want posix_emulation for target builds.
['_toolset == "target"', {
['_toolset == "target" and starboard == 0', {
'dependencies': [
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
}],
['_toolset == "target" and starboard != 0', {
'dependencies': [
'<(DEPTH)/starboard/starboard.gyp:starboard',
],
}],
],
'sources': [
'debug/debugger_shell.cc',
Expand Down Expand Up @@ -321,11 +326,16 @@
'../build/linux/system.gyp:gtk',
],
}],
['OS=="lb_shell"', {
['OS=="lb_shell" and starboard == 0', {
'dependencies': [
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
}],
['OS=="lb_shell" and starboard != 0', {
'dependencies': [
'<(DEPTH)/starboard/starboard.gyp:starboard',
],
}],
],
'export_dependent_settings': [
'base',
Expand Down
12 changes: 11 additions & 1 deletion crypto/crypto.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,22 @@
['OS=="lb_shell"', {
'dependencies' : [
'../third_party/openssl/openssl.gyp:openssl',
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
'sources/': [
['exclude', '_nss.cc$'],
['exclude', '_win.cc$'],
],
'conditions': [
['starboard == 0', {
'dependencies': [
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
}, { # else
'dependencies': [
'<(DEPTH)/starboard/starboard.gyp:starboard',
],
}],
],
}],
[ 'use_openssl==1', {
# TODO(joth): Use a glob to match exclude patterns once the
Expand Down
12 changes: 9 additions & 3 deletions media/media.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,6 @@
'<(lbshell_root)/src/platform/<(target_arch)/chromium',
'<(lbshell_root)/src/platform/<(target_arch)/lb_shell',
],
'dependencies': [
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
'sources/': [
['exclude', 'android'],
# media is not excluding windows sources automatically.
Expand Down Expand Up @@ -536,6 +533,15 @@
['exclude', 'video/capture/fake_video_capture_device'],
],
'conditions': [
['starboard == 0', {
'dependencies': [
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
}, { # else
'dependencies': [
'<(DEPTH)/starboard/starboard.gyp:starboard',
],
}],
['target_arch=="xb1" and actual_target_arch!="win"', {
'dependencies' : [
'../third_party/modp_b64/modp_b64.gyp:modp_b64',
Expand Down
10 changes: 9 additions & 1 deletion net/net.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,6 @@
['OS=="lb_shell"', {
'dependencies': [
'../third_party/openssl/openssl.gyp:openssl',
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
'include_dirs': [
'<(lbshell_root)/src/platform/<(actual_target_arch)/chromium',
Expand Down Expand Up @@ -1015,6 +1014,15 @@
['exclude', 'disk_cache/']
],
'conditions': [
['starboard == 0', {
'dependencies': [
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
}, { # else
'dependencies': [
'<(DEPTH)/starboard/starboard.gyp:starboard',
],
}],
['target_arch=="android"', {
'sources!': [
'<(lbshell_root)/src/tcp_client_socket_shell.cc',
Expand Down
7 changes: 6 additions & 1 deletion sql/sql.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,14 @@
'transaction.h',
],
'conditions': [
['OS=="lb_shell"', {
['OS=="lb_shell" and starboard == 0', {
'dependencies': [
'<(lbshell_root)/build/projects/posix_emulation.gyp:posix_emulation',
],
}],
['OS=="lb_shell" and starboard != 0', {
'dependencies': [
'<(DEPTH)/starboard/starboard.gyp:starboard',
],
}],
],
Expand Down

0 comments on commit 543b692

Please sign in to comment.