Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
f8372c60
Commit
f8372c60
authored
8 years ago
by
Muxi Yan
Browse files
Options
Downloads
Patches
Plain Diff
Minor revisions
parent
2a5072e8
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
gRPC-Core.podspec
+2
-2
2 additions, 2 deletions
gRPC-Core.podspec
src/objective-c/tests/Podfile
+4
-4
4 additions, 4 deletions
src/objective-c/tests/Podfile
templates/gRPC-Core.podspec.template
+2
-2
2 additions, 2 deletions
templates/gRPC-Core.podspec.template
with
8 additions
and
8 deletions
gRPC-Core.podspec
+
2
−
2
View file @
f8372c60
...
@@ -770,13 +770,13 @@ Pod::Spec.new do |s|
...
@@ -770,13 +770,13 @@ Pod::Spec.new do |s|
ss
.
source_files
=
'include/grpc/grpc_cronet.h'
ss
.
source_files
=
'include/grpc/grpc_cronet.h'
end
end
s
.
subspec
'Cronet-Implement'
do
|
ss
|
s
.
subspec
'Cronet-Implement
ation
'
do
|
ss
|
ss
.
header_mappings_dir
=
'.'
ss
.
header_mappings_dir
=
'.'
ss
.
source_files
=
'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c'
,
ss
.
source_files
=
'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c'
,
'src/core/ext/transport/cronet/transport/cronet_transport.c'
'src/core/ext/transport/cronet/transport/cronet_transport.c'
end
end
s
.
subspec
'
Cronet-
Tests'
do
|
ss
|
s
.
subspec
'Tests'
do
|
ss
|
ss
.
header_mappings_dir
=
'.'
ss
.
header_mappings_dir
=
'.'
ss
.
source_files
=
'test/core/end2end/cq_verifier.{c,h}'
,
ss
.
source_files
=
'test/core/end2end/cq_verifier.{c,h}'
,
...
...
This diff is collapsed.
Click to expand it.
src/objective-c/tests/Podfile
+
4
−
4
View file @
f8372c60
...
@@ -32,7 +32,7 @@ GRPC_LOCAL_SRC = '../../..'
...
@@ -32,7 +32,7 @@ GRPC_LOCAL_SRC = '../../..'
if
target_name
==
'InteropTestsRemoteWithCronet'
if
target_name
==
'InteropTestsRemoteWithCronet'
pod
'CronetFramework'
,
:podspec
=>
"
#{
GRPC_LOCAL_SRC
}
/src/objective-c"
pod
'CronetFramework'
,
:podspec
=>
"
#{
GRPC_LOCAL_SRC
}
/src/objective-c"
pod
'gRPC-Core/Cronet-Implement'
,
:path
=>
GRPC_LOCAL_SRC
pod
'gRPC-Core/Cronet-Implement
ation
'
,
:path
=>
GRPC_LOCAL_SRC
end
end
end
end
end
end
...
@@ -42,8 +42,8 @@ target 'CoreCronetEnd2EndTests' do
...
@@ -42,8 +42,8 @@ target 'CoreCronetEnd2EndTests' do
pod
'CronetFramework'
,
:podspec
=>
"
#{
GRPC_LOCAL_SRC
}
/src/objective-c"
pod
'CronetFramework'
,
:podspec
=>
"
#{
GRPC_LOCAL_SRC
}
/src/objective-c"
pod
'gRPC-Core'
,
:path
=>
GRPC_LOCAL_SRC
pod
'gRPC-Core'
,
:path
=>
GRPC_LOCAL_SRC
pod
'gRPC-Core/Cronet-Interface'
,
:path
=>
GRPC_LOCAL_SRC
pod
'gRPC-Core/Cronet-Interface'
,
:path
=>
GRPC_LOCAL_SRC
pod
'gRPC-Core/Cronet-Implement'
,
:path
=>
GRPC_LOCAL_SRC
pod
'gRPC-Core/Cronet-Implement
ation
'
,
:path
=>
GRPC_LOCAL_SRC
pod
'gRPC-Core/
Cronet-
Tests'
,
:path
=>
GRPC_LOCAL_SRC
pod
'gRPC-Core/Tests'
,
:path
=>
GRPC_LOCAL_SRC
end
end
# gRPC-Core.podspec needs to be modified to be successfully used for local development. A Podfile's
# gRPC-Core.podspec needs to be modified to be successfully used for local development. A Podfile's
...
@@ -82,7 +82,7 @@ post_install do |installer|
...
@@ -82,7 +82,7 @@ post_install do |installer|
target
.
build_configurations
.
each
do
|
config
|
target
.
build_configurations
.
each
do
|
config
|
config
.
build_settings
[
'GCC_TREAT_WARNINGS_AS_ERRORS'
]
=
'YES'
config
.
build_settings
[
'GCC_TREAT_WARNINGS_AS_ERRORS'
]
=
'YES'
end
end
if
target
.
name
==
'gRPC-Core'
or
target
.
name
==
'gRPC-Core.default-Cronet-Implement-Cronet-Interface-
Cronet-
Tests'
or
target
.
name
==
'gRPC-Core.default-Cronet-Implement'
if
target
.
name
==
'gRPC-Core'
or
target
.
name
==
'gRPC-Core.default-Cronet-Implement
ation
-Cronet-Interface-Tests'
or
target
.
name
==
'gRPC-Core.default-Cronet-Implement
ation
'
target
.
build_configurations
.
each
do
|
config
|
target
.
build_configurations
.
each
do
|
config
|
# TODO(zyc): Remove this setting after the issue is resolved
# TODO(zyc): Remove this setting after the issue is resolved
# GPR_UNREACHABLE_CODE causes "Control may reach end of non-void
# GPR_UNREACHABLE_CODE causes "Control may reach end of non-void
...
...
This diff is collapsed.
Click to expand it.
templates/gRPC-Core.podspec.template
+
2
−
2
View file @
f8372c60
...
@@ -162,13 +162,13 @@
...
@@ -162,13 +162,13 @@
ss.source_files = 'include/grpc/grpc_cronet.h'
ss.source_files = 'include/grpc/grpc_cronet.h'
end
end
s.subspec 'Cronet-Implement' do |ss|
s.subspec 'Cronet-Implement
ation
' do |ss|
ss.header_mappings_dir = '.'
ss.header_mappings_dir = '.'
ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
'src/core/ext/transport/cronet/transport/cronet_transport.c'
'src/core/ext/transport/cronet/transport/cronet_transport.c'
end
end
s.subspec '
Cronet-
Tests' do |ss|
s.subspec 'Tests' do |ss|
ss.header_mappings_dir = '.'
ss.header_mappings_dir = '.'
ss.source_files = 'test/core/end2end/cq_verifier.{c,h}',
ss.source_files = 'test/core/end2end/cq_verifier.{c,h}',
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment