Index: BUILD.gn |
diff --git a/BUILD.gn b/BUILD.gn |
index d223f1341222a60036622361d52085365fbd0807..eeeb7fa211332620a93eeb06e85a8a487986dc71 100644 |
--- a/BUILD.gn |
+++ b/BUILD.gn |
@@ -3,6 +3,11 @@ |
# Please look at the templates directory instead. |
# This file can be regenerated from the template by running |
# tools/buildgen/generate_projects.sh |
+if (is_android) { |
+ import("//build/config/android/config.gni") |
+ import("//build/config/android/rules.gni") |
+} |
+ |
config("grpc_config") { |
include_dirs = [ |
".", |
@@ -18,6 +23,14 @@ config("grpc_config") { |
# https://crbug.com/593874 |
"GRPC_CXX0X_NO_THREAD", |
] |
+ |
+ cflags_c = [ |
+ "-std=c99" |
+ ] |
+ |
+ if (is_android) { |
+ libs = [ "log" ] # For __android_log_write |
+ } |
} |
@@ -54,20 +67,17 @@ source_set("gpr") { |
"include/grpc/support/tls_msvc.h", |
"include/grpc/support/tls_pthread.h", |
"include/grpc/support/useful.h", |
- "include/grpc/impl/codegen/alloc.h", |
"include/grpc/impl/codegen/atm.h", |
"include/grpc/impl/codegen/atm_gcc_atomic.h", |
"include/grpc/impl/codegen/atm_gcc_sync.h", |
"include/grpc/impl/codegen/atm_windows.h", |
- "include/grpc/impl/codegen/log.h", |
+ "include/grpc/impl/codegen/gpr_types.h", |
"include/grpc/impl/codegen/port_platform.h", |
"include/grpc/impl/codegen/slice.h", |
- "include/grpc/impl/codegen/slice_buffer.h", |
"include/grpc/impl/codegen/sync.h", |
"include/grpc/impl/codegen/sync_generic.h", |
"include/grpc/impl/codegen/sync_posix.h", |
"include/grpc/impl/codegen/sync_windows.h", |
- "include/grpc/impl/codegen/time.h", |
"src/core/lib/profiling/timers.h", |
"src/core/lib/support/backoff.h", |
"src/core/lib/support/block_annotate.h", |
@@ -151,38 +161,35 @@ source_set("grpc") { |
"include/grpc/grpc_posix.h", |
"include/grpc/grpc_security_constants.h", |
"include/grpc/status.h", |
- "include/grpc/impl/codegen/byte_buffer.h", |
"include/grpc/impl/codegen/byte_buffer_reader.h", |
"include/grpc/impl/codegen/compression_types.h", |
"include/grpc/impl/codegen/connectivity_state.h", |
"include/grpc/impl/codegen/grpc_types.h", |
"include/grpc/impl/codegen/propagation_bits.h", |
"include/grpc/impl/codegen/status.h", |
- "include/grpc/impl/codegen/alloc.h", |
"include/grpc/impl/codegen/atm.h", |
"include/grpc/impl/codegen/atm_gcc_atomic.h", |
"include/grpc/impl/codegen/atm_gcc_sync.h", |
"include/grpc/impl/codegen/atm_windows.h", |
- "include/grpc/impl/codegen/log.h", |
+ "include/grpc/impl/codegen/gpr_types.h", |
"include/grpc/impl/codegen/port_platform.h", |
"include/grpc/impl/codegen/slice.h", |
- "include/grpc/impl/codegen/slice_buffer.h", |
"include/grpc/impl/codegen/sync.h", |
"include/grpc/impl/codegen/sync_generic.h", |
"include/grpc/impl/codegen/sync_posix.h", |
"include/grpc/impl/codegen/sync_windows.h", |
- "include/grpc/impl/codegen/time.h", |
"include/grpc/grpc_security.h", |
- "include/grpc/census.h", |
"src/core/lib/channel/channel_args.h", |
"src/core/lib/channel/channel_stack.h", |
"src/core/lib/channel/channel_stack_builder.h", |
"src/core/lib/channel/compress_filter.h", |
"src/core/lib/channel/connected_channel.h", |
"src/core/lib/channel/context.h", |
+ "src/core/lib/channel/deadline_filter.h", |
"src/core/lib/channel/handshaker.h", |
"src/core/lib/channel/http_client_filter.h", |
"src/core/lib/channel/http_server_filter.h", |
+ "src/core/lib/channel/message_size_filter.h", |
"src/core/lib/compression/algorithm_metadata.h", |
"src/core/lib/compression/message_compress.h", |
"src/core/lib/debug/trace.h", |
@@ -227,10 +234,10 @@ source_set("grpc") { |
"src/core/lib/iomgr/timer_heap.h", |
"src/core/lib/iomgr/udp_server.h", |
"src/core/lib/iomgr/unix_sockets_posix.h", |
+ "src/core/lib/iomgr/wakeup_fd_cv.h", |
"src/core/lib/iomgr/wakeup_fd_pipe.h", |
"src/core/lib/iomgr/wakeup_fd_posix.h", |
"src/core/lib/iomgr/workqueue.h", |
- "src/core/lib/iomgr/workqueue_posix.h", |
"src/core/lib/iomgr/workqueue_windows.h", |
"src/core/lib/json/json.h", |
"src/core/lib/json/json_common.h", |
@@ -303,6 +310,7 @@ source_set("grpc") { |
"src/core/ext/client_config/client_channel.h", |
"src/core/ext/client_config/client_channel_factory.h", |
"src/core/ext/client_config/connector.h", |
+ "src/core/ext/client_config/http_connect_handshaker.h", |
"src/core/ext/client_config/initial_connect_string.h", |
"src/core/ext/client_config/lb_policy.h", |
"src/core/ext/client_config/lb_policy_factory.h", |
@@ -323,9 +331,11 @@ source_set("grpc") { |
"src/core/lib/channel/channel_stack_builder.c", |
"src/core/lib/channel/compress_filter.c", |
"src/core/lib/channel/connected_channel.c", |
+ "src/core/lib/channel/deadline_filter.c", |
"src/core/lib/channel/handshaker.c", |
"src/core/lib/channel/http_client_filter.c", |
"src/core/lib/channel/http_server_filter.c", |
+ "src/core/lib/channel/message_size_filter.c", |
"src/core/lib/compression/compression.c", |
"src/core/lib/compression/message_compress.c", |
"src/core/lib/debug/trace.c", |
@@ -372,11 +382,11 @@ source_set("grpc") { |
"src/core/lib/iomgr/udp_server.c", |
"src/core/lib/iomgr/unix_sockets_posix.c", |
"src/core/lib/iomgr/unix_sockets_posix_noop.c", |
+ "src/core/lib/iomgr/wakeup_fd_cv.c", |
"src/core/lib/iomgr/wakeup_fd_eventfd.c", |
"src/core/lib/iomgr/wakeup_fd_nospecial.c", |
"src/core/lib/iomgr/wakeup_fd_pipe.c", |
"src/core/lib/iomgr/wakeup_fd_posix.c", |
- "src/core/lib/iomgr/workqueue_posix.c", |
"src/core/lib/iomgr/workqueue_windows.c", |
"src/core/lib/json/json.c", |
"src/core/lib/json/json_reader.c", |
@@ -466,6 +476,7 @@ source_set("grpc") { |
"src/core/ext/client_config/client_config_plugin.c", |
"src/core/ext/client_config/connector.c", |
"src/core/ext/client_config/default_initial_connect_string.c", |
+ "src/core/ext/client_config/http_connect_handshaker.c", |
"src/core/ext/client_config/initial_connect_string.c", |
"src/core/ext/client_config/lb_policy.c", |
"src/core/ext/client_config/lb_policy_factory.c", |
@@ -515,27 +526,23 @@ source_set("grpc_cronet") { |
"include/grpc/grpc_posix.h", |
"include/grpc/grpc_security_constants.h", |
"include/grpc/status.h", |
- "include/grpc/impl/codegen/byte_buffer.h", |
"include/grpc/impl/codegen/byte_buffer_reader.h", |
"include/grpc/impl/codegen/compression_types.h", |
"include/grpc/impl/codegen/connectivity_state.h", |
"include/grpc/impl/codegen/grpc_types.h", |
"include/grpc/impl/codegen/propagation_bits.h", |
"include/grpc/impl/codegen/status.h", |
- "include/grpc/impl/codegen/alloc.h", |
"include/grpc/impl/codegen/atm.h", |
"include/grpc/impl/codegen/atm_gcc_atomic.h", |
"include/grpc/impl/codegen/atm_gcc_sync.h", |
"include/grpc/impl/codegen/atm_windows.h", |
- "include/grpc/impl/codegen/log.h", |
+ "include/grpc/impl/codegen/gpr_types.h", |
Garrett Casto
2016/10/21 22:59:32
Why are there new includes added after this change
|
"include/grpc/impl/codegen/port_platform.h", |
"include/grpc/impl/codegen/slice.h", |
- "include/grpc/impl/codegen/slice_buffer.h", |
"include/grpc/impl/codegen/sync.h", |
"include/grpc/impl/codegen/sync_generic.h", |
"include/grpc/impl/codegen/sync_posix.h", |
"include/grpc/impl/codegen/sync_windows.h", |
- "include/grpc/impl/codegen/time.h", |
"include/grpc/grpc_cronet.h", |
"include/grpc/grpc_security.h", |
"src/core/lib/channel/channel_args.h", |
@@ -544,9 +551,11 @@ source_set("grpc_cronet") { |
"src/core/lib/channel/compress_filter.h", |
"src/core/lib/channel/connected_channel.h", |
"src/core/lib/channel/context.h", |
+ "src/core/lib/channel/deadline_filter.h", |
"src/core/lib/channel/handshaker.h", |
"src/core/lib/channel/http_client_filter.h", |
"src/core/lib/channel/http_server_filter.h", |
+ "src/core/lib/channel/message_size_filter.h", |
"src/core/lib/compression/algorithm_metadata.h", |
"src/core/lib/compression/message_compress.h", |
"src/core/lib/debug/trace.h", |
@@ -591,10 +600,10 @@ source_set("grpc_cronet") { |
"src/core/lib/iomgr/timer_heap.h", |
"src/core/lib/iomgr/udp_server.h", |
"src/core/lib/iomgr/unix_sockets_posix.h", |
+ "src/core/lib/iomgr/wakeup_fd_cv.h", |
"src/core/lib/iomgr/wakeup_fd_pipe.h", |
"src/core/lib/iomgr/wakeup_fd_posix.h", |
"src/core/lib/iomgr/workqueue.h", |
- "src/core/lib/iomgr/workqueue_posix.h", |
"src/core/lib/iomgr/workqueue_windows.h", |
"src/core/lib/json/json.h", |
"src/core/lib/json/json_common.h", |
@@ -644,6 +653,7 @@ source_set("grpc_cronet") { |
"src/core/ext/client_config/client_channel.h", |
"src/core/ext/client_config/client_channel_factory.h", |
"src/core/ext/client_config/connector.h", |
+ "src/core/ext/client_config/http_connect_handshaker.h", |
"src/core/ext/client_config/initial_connect_string.h", |
"src/core/ext/client_config/lb_policy.h", |
"src/core/ext/client_config/lb_policy_factory.h", |
@@ -686,9 +696,11 @@ source_set("grpc_cronet") { |
"src/core/lib/channel/channel_stack_builder.c", |
"src/core/lib/channel/compress_filter.c", |
"src/core/lib/channel/connected_channel.c", |
+ "src/core/lib/channel/deadline_filter.c", |
"src/core/lib/channel/handshaker.c", |
"src/core/lib/channel/http_client_filter.c", |
"src/core/lib/channel/http_server_filter.c", |
+ "src/core/lib/channel/message_size_filter.c", |
"src/core/lib/compression/compression.c", |
"src/core/lib/compression/message_compress.c", |
"src/core/lib/debug/trace.c", |
@@ -735,11 +747,11 @@ source_set("grpc_cronet") { |
"src/core/lib/iomgr/udp_server.c", |
"src/core/lib/iomgr/unix_sockets_posix.c", |
"src/core/lib/iomgr/unix_sockets_posix_noop.c", |
+ "src/core/lib/iomgr/wakeup_fd_cv.c", |
"src/core/lib/iomgr/wakeup_fd_eventfd.c", |
"src/core/lib/iomgr/wakeup_fd_nospecial.c", |
"src/core/lib/iomgr/wakeup_fd_pipe.c", |
"src/core/lib/iomgr/wakeup_fd_posix.c", |
- "src/core/lib/iomgr/workqueue_posix.c", |
"src/core/lib/iomgr/workqueue_windows.c", |
"src/core/lib/json/json.c", |
"src/core/lib/json/json_reader.c", |
@@ -803,6 +815,7 @@ source_set("grpc_cronet") { |
"src/core/ext/client_config/client_config_plugin.c", |
"src/core/ext/client_config/connector.c", |
"src/core/ext/client_config/default_initial_connect_string.c", |
+ "src/core/ext/client_config/http_connect_handshaker.c", |
"src/core/ext/client_config/initial_connect_string.c", |
"src/core/ext/client_config/lb_policy.c", |
"src/core/ext/client_config/lb_policy_factory.c", |
@@ -869,37 +882,34 @@ source_set("grpc_unsecure") { |
"include/grpc/grpc_posix.h", |
"include/grpc/grpc_security_constants.h", |
"include/grpc/status.h", |
- "include/grpc/impl/codegen/byte_buffer.h", |
"include/grpc/impl/codegen/byte_buffer_reader.h", |
"include/grpc/impl/codegen/compression_types.h", |
"include/grpc/impl/codegen/connectivity_state.h", |
"include/grpc/impl/codegen/grpc_types.h", |
"include/grpc/impl/codegen/propagation_bits.h", |
"include/grpc/impl/codegen/status.h", |
- "include/grpc/impl/codegen/alloc.h", |
"include/grpc/impl/codegen/atm.h", |
"include/grpc/impl/codegen/atm_gcc_atomic.h", |
"include/grpc/impl/codegen/atm_gcc_sync.h", |
"include/grpc/impl/codegen/atm_windows.h", |
- "include/grpc/impl/codegen/log.h", |
+ "include/grpc/impl/codegen/gpr_types.h", |
"include/grpc/impl/codegen/port_platform.h", |
"include/grpc/impl/codegen/slice.h", |
- "include/grpc/impl/codegen/slice_buffer.h", |
"include/grpc/impl/codegen/sync.h", |
"include/grpc/impl/codegen/sync_generic.h", |
"include/grpc/impl/codegen/sync_posix.h", |
"include/grpc/impl/codegen/sync_windows.h", |
- "include/grpc/impl/codegen/time.h", |
- "include/grpc/census.h", |
"src/core/lib/channel/channel_args.h", |
"src/core/lib/channel/channel_stack.h", |
"src/core/lib/channel/channel_stack_builder.h", |
"src/core/lib/channel/compress_filter.h", |
"src/core/lib/channel/connected_channel.h", |
"src/core/lib/channel/context.h", |
+ "src/core/lib/channel/deadline_filter.h", |
"src/core/lib/channel/handshaker.h", |
"src/core/lib/channel/http_client_filter.h", |
"src/core/lib/channel/http_server_filter.h", |
+ "src/core/lib/channel/message_size_filter.h", |
"src/core/lib/compression/algorithm_metadata.h", |
"src/core/lib/compression/message_compress.h", |
"src/core/lib/debug/trace.h", |
@@ -944,10 +954,10 @@ source_set("grpc_unsecure") { |
"src/core/lib/iomgr/timer_heap.h", |
"src/core/lib/iomgr/udp_server.h", |
"src/core/lib/iomgr/unix_sockets_posix.h", |
+ "src/core/lib/iomgr/wakeup_fd_cv.h", |
"src/core/lib/iomgr/wakeup_fd_pipe.h", |
"src/core/lib/iomgr/wakeup_fd_posix.h", |
"src/core/lib/iomgr/workqueue.h", |
- "src/core/lib/iomgr/workqueue_posix.h", |
"src/core/lib/iomgr/workqueue_windows.h", |
"src/core/lib/json/json.h", |
"src/core/lib/json/json_common.h", |
@@ -996,6 +1006,7 @@ source_set("grpc_unsecure") { |
"src/core/ext/client_config/client_channel.h", |
"src/core/ext/client_config/client_channel_factory.h", |
"src/core/ext/client_config/connector.h", |
+ "src/core/ext/client_config/http_connect_handshaker.h", |
"src/core/ext/client_config/initial_connect_string.h", |
"src/core/ext/client_config/lb_policy.h", |
"src/core/ext/client_config/lb_policy_factory.h", |
@@ -1017,9 +1028,11 @@ source_set("grpc_unsecure") { |
"src/core/lib/channel/channel_stack_builder.c", |
"src/core/lib/channel/compress_filter.c", |
"src/core/lib/channel/connected_channel.c", |
+ "src/core/lib/channel/deadline_filter.c", |
"src/core/lib/channel/handshaker.c", |
"src/core/lib/channel/http_client_filter.c", |
"src/core/lib/channel/http_server_filter.c", |
+ "src/core/lib/channel/message_size_filter.c", |
"src/core/lib/compression/compression.c", |
"src/core/lib/compression/message_compress.c", |
"src/core/lib/debug/trace.c", |
@@ -1066,11 +1079,11 @@ source_set("grpc_unsecure") { |
"src/core/lib/iomgr/udp_server.c", |
"src/core/lib/iomgr/unix_sockets_posix.c", |
"src/core/lib/iomgr/unix_sockets_posix_noop.c", |
+ "src/core/lib/iomgr/wakeup_fd_cv.c", |
"src/core/lib/iomgr/wakeup_fd_eventfd.c", |
"src/core/lib/iomgr/wakeup_fd_nospecial.c", |
"src/core/lib/iomgr/wakeup_fd_pipe.c", |
"src/core/lib/iomgr/wakeup_fd_posix.c", |
- "src/core/lib/iomgr/workqueue_posix.c", |
"src/core/lib/iomgr/workqueue_windows.c", |
"src/core/lib/json/json.c", |
"src/core/lib/json/json_reader.c", |
@@ -1134,6 +1147,7 @@ source_set("grpc_unsecure") { |
"src/core/ext/client_config/client_config_plugin.c", |
"src/core/ext/client_config/connector.c", |
"src/core/ext/client_config/default_initial_connect_string.c", |
+ "src/core/ext/client_config/http_connect_handshaker.c", |
"src/core/ext/client_config/initial_connect_string.c", |
"src/core/ext/client_config/lb_policy.c", |
"src/core/ext/client_config/lb_policy_factory.c", |
@@ -1241,6 +1255,7 @@ source_set("grpc++") { |
"include/grpc++/impl/codegen/service_type.h", |
"include/grpc++/impl/codegen/status.h", |
"include/grpc++/impl/codegen/status_code_enum.h", |
+ "include/grpc++/impl/codegen/status_helper.h", |
"include/grpc++/impl/codegen/string_ref.h", |
"include/grpc++/impl/codegen/stub_options.h", |
"include/grpc++/impl/codegen/sync.h", |
@@ -1248,27 +1263,23 @@ source_set("grpc++") { |
"include/grpc++/impl/codegen/sync_no_cxx11.h", |
"include/grpc++/impl/codegen/sync_stream.h", |
"include/grpc++/impl/codegen/time.h", |
- "include/grpc/impl/codegen/byte_buffer.h", |
"include/grpc/impl/codegen/byte_buffer_reader.h", |
"include/grpc/impl/codegen/compression_types.h", |
"include/grpc/impl/codegen/connectivity_state.h", |
"include/grpc/impl/codegen/grpc_types.h", |
"include/grpc/impl/codegen/propagation_bits.h", |
"include/grpc/impl/codegen/status.h", |
- "include/grpc/impl/codegen/alloc.h", |
"include/grpc/impl/codegen/atm.h", |
"include/grpc/impl/codegen/atm_gcc_atomic.h", |
"include/grpc/impl/codegen/atm_gcc_sync.h", |
"include/grpc/impl/codegen/atm_windows.h", |
- "include/grpc/impl/codegen/log.h", |
+ "include/grpc/impl/codegen/gpr_types.h", |
"include/grpc/impl/codegen/port_platform.h", |
"include/grpc/impl/codegen/slice.h", |
- "include/grpc/impl/codegen/slice_buffer.h", |
"include/grpc/impl/codegen/sync.h", |
"include/grpc/impl/codegen/sync_generic.h", |
"include/grpc/impl/codegen/sync_posix.h", |
"include/grpc/impl/codegen/sync_windows.h", |
- "include/grpc/impl/codegen/time.h", |
"include/grpc++/impl/codegen/core_codegen.h", |
"src/cpp/client/secure_credentials.h", |
"src/cpp/common/secure_auth_context.h", |
@@ -1400,6 +1411,7 @@ source_set("grpc++_unsecure") { |
"include/grpc++/impl/codegen/service_type.h", |
"include/grpc++/impl/codegen/status.h", |
"include/grpc++/impl/codegen/status_code_enum.h", |
+ "include/grpc++/impl/codegen/status_helper.h", |
"include/grpc++/impl/codegen/string_ref.h", |
"include/grpc++/impl/codegen/stub_options.h", |
"include/grpc++/impl/codegen/sync.h", |
@@ -1407,27 +1419,23 @@ source_set("grpc++_unsecure") { |
"include/grpc++/impl/codegen/sync_no_cxx11.h", |
"include/grpc++/impl/codegen/sync_stream.h", |
"include/grpc++/impl/codegen/time.h", |
- "include/grpc/impl/codegen/byte_buffer.h", |
"include/grpc/impl/codegen/byte_buffer_reader.h", |
"include/grpc/impl/codegen/compression_types.h", |
"include/grpc/impl/codegen/connectivity_state.h", |
"include/grpc/impl/codegen/grpc_types.h", |
"include/grpc/impl/codegen/propagation_bits.h", |
"include/grpc/impl/codegen/status.h", |
- "include/grpc/impl/codegen/alloc.h", |
"include/grpc/impl/codegen/atm.h", |
"include/grpc/impl/codegen/atm_gcc_atomic.h", |
"include/grpc/impl/codegen/atm_gcc_sync.h", |
"include/grpc/impl/codegen/atm_windows.h", |
- "include/grpc/impl/codegen/log.h", |
+ "include/grpc/impl/codegen/gpr_types.h", |
"include/grpc/impl/codegen/port_platform.h", |
"include/grpc/impl/codegen/slice.h", |
- "include/grpc/impl/codegen/slice_buffer.h", |
"include/grpc/impl/codegen/sync.h", |
"include/grpc/impl/codegen/sync_generic.h", |
"include/grpc/impl/codegen/sync_posix.h", |
"include/grpc/impl/codegen/sync_windows.h", |
- "include/grpc/impl/codegen/time.h", |
"src/cpp/client/create_channel_internal.h", |
"src/cpp/common/channel_filter.h", |
"src/cpp/server/dynamic_thread_pool.h", |
@@ -1493,6 +1501,8 @@ source_set("grpc_plugin_support") { |
"src/compiler/node_generator_helpers.h", |
"src/compiler/objective_c_generator.h", |
"src/compiler/objective_c_generator_helpers.h", |
+ "src/compiler/php_generator.h", |
+ "src/compiler/php_generator_helpers.h", |
"src/compiler/python_generator.h", |
"src/compiler/ruby_generator.h", |
"src/compiler/ruby_generator_helpers-inl.h", |
@@ -1502,6 +1512,7 @@ source_set("grpc_plugin_support") { |
"src/compiler/csharp_generator.cc", |
"src/compiler/node_generator.cc", |
"src/compiler/objective_c_generator.cc", |
+ "src/compiler/php_generator.cc", |
"src/compiler/python_generator.cc", |
"src/compiler/ruby_generator.cc", |
] |