Merge pull request #322 from eseidelGoogle/ios_build

Fix iOS build
This commit is contained in:
Eric Seidel 2015-07-28 13:05:55 -07:00
commit a342f441a8
2 changed files with 7 additions and 3 deletions

View File

@ -10,11 +10,11 @@
ios_app GN template
-->
<key>CFBundleExecutable</key>
<string>Sky</string>
<string>SkyShell</string>
<key>CFBundleIdentifier</key>
<string>org.domokit.sky</string>
<string>org.domokit.SkyShell</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>

View File

@ -11,7 +11,9 @@
#include "sky/engine/wtf/Assertions.h"
#include "sky/services/ns_net/network_service_impl.h"
#include "sky/shell/service_provider.h"
#if !TARGET_OS_IPHONE
#include "sky/shell/testing/test_runner.h"
#endif
namespace sky {
namespace shell {
@ -27,7 +29,9 @@ static void CreatePlatformServiceProvider(
g_service_provider.Get().reset(new mojo::ServiceProviderImpl(request.Pass()));
g_network_service_factory.Get().reset(new mojo::NetworkServiceFactory());
g_service_provider.Get()->AddService(g_network_service_factory.Get().get());
#if !TARGET_OS_IPHONE
g_service_provider.Get()->AddService(&TestRunner::Shared());
#endif
}
mojo::ServiceProviderPtr CreateServiceProvider(