Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Build Target Reorganization Part 2 (#30570)

Browse Source 
* Clean up grpc_base

* Clean up grpc

* Clean up grpc_insecure
pull/30611/head
Cheng-Yu Chung 2 years ago committed by GitHub
parent 97f29a1dca
commit 0c46726229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 106 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 98
      BUILD
  2. 24
      CMakeLists.txt
  3. 16
      Makefile
  4. 24
      build_autogenerated.yaml
  5. 13
      test/core/security/BUILD
  6. 1
      test/core/xds/BUILD

98
BUILD
Unescape View File

@ -202,6 +202,14 @@ GRPC_PUBLIC_HDRS = [
"include/grpc/status.h",
"include/grpc/load_reporting.h",
"include/grpc/support/workaround_list.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/slice.h",
]
GRPC_PUBLIC_EVENT_ENGINE_HDRS = [
@ -406,7 +414,6 @@ grpc_cc_library(
],
language = "c++",
public_hdrs = GRPC_PUBLIC_HDRS,
standalone = True,
tags = [
"avoid_dep",
"nofixdeps",
@ -421,7 +428,6 @@ grpc_cc_library(
"gpr",
"grpc_authorization_base",
"grpc_base",
"grpc_codegen",
"grpc_common",
"grpc_http_filters",
"grpc_security_base",
@ -469,7 +475,6 @@ grpc_cc_library(
"//conditions:default": GRPC_XDS_TARGETS,
},
],
standalone = True,
tags = [
"grpc_avoid_dep",
"nofixdeps",
@ -484,19 +489,43 @@ grpc_cc_library(
"default_event_engine",
"forkable",
"gpr",
"grpc_alts_credentials",
"grpc_authorization_base",
"grpc_base",
"grpc_client_channel",
"grpc_codegen",
"grpc_common",
"grpc_credentials_util",
"grpc_external_account_credentials",
"grpc_fake_credentials",
"grpc_google_default_credentials",
"grpc_http_filters",
"grpc_secure",
"grpc_iam_credentials",
"grpc_insecure_credentials",
"grpc_jwt_credentials",
"grpc_local_credentials",
"grpc_oauth2_credentials",
"grpc_security_base",
"grpc_ssl_credentials",
"grpc_tls_credentials",
"grpc_trace",
"grpc_transport_chttp2_alpn",
"http_connect_handshaker",
"httpcli",
"httpcli_ssl_credentials",
"iomgr_timer",
"json",
"posix_event_engine_timer_manager",
"promise",
"ref_counted",
"ref_counted_ptr",
"slice",
"slice_refcount",
"sockaddr_utils",
"tcp_connect_handshaker",
"tsi_base",
"uri_parser",
"useful",
],
)
@ -613,7 +642,6 @@ grpc_cc_library(
"grpc_base",
"grpc_codegen",
"grpc_credentials_util",
"grpc_secure",
"grpc_security_base",
"json",
"ref_counted_ptr",
@ -3117,14 +3145,16 @@ grpc_cc_library(
"absl/container:flat_hash_map",
"absl/container:inlined_vector",
"absl/functional:any_invocable",
"absl/functional:bind_front",
"absl/functional:function_ref",
"absl/memory",
"absl/meta:type_traits",
"absl/status:statusor",
"absl/random",
"absl/status",
"absl/strings:str_format",
"absl/status:statusor",
"absl/strings",
"absl/strings:str_format",
"absl/synchronization",
"absl/time",
"absl/types:optional",
"absl/types:variant",
"absl/utility",
@ -3135,6 +3165,7 @@ grpc_cc_library(
tags = ["nofixdeps"],
visibility = ["@grpc:alt_grpc_base_legacy"],
deps = [
"activity",
"arena",
"arena_promise",
"atomic_utils",
@ -3149,6 +3180,7 @@ grpc_cc_library(
"chunked_vector",
"closure",
"config",
"context",
"cpp_impl_of",
"debug_location",
"default_event_engine",
@ -3157,12 +3189,11 @@ grpc_cc_library(
"event_engine_common",
"exec_ctx",
"gpr",
"gpr_codegen",
"gpr_tls",
"grpc_codegen",
"grpc_public_hdrs",
"grpc_sockaddr",
"grpc_trace",
"handshaker_registry",
"iomgr_fwd",
"iomgr_port",
"iomgr_timer",
"json",
@ -3170,7 +3201,6 @@ grpc_cc_library(
"memory_quota",
"orphanable",
"packed_table",
"percent_encoding",
"poll",
"pollset_set",
"promise",
@ -4395,7 +4425,6 @@ grpc_cc_library(
"grpc_matchers",
"grpc_outlier_detection_header",
"grpc_rbac_filter",
"grpc_secure",
"grpc_security_base",
"grpc_sockaddr",
"grpc_tls_credentials",
@ -6113,49 +6142,6 @@ grpc_cc_library(
],
)
grpc_cc_library(
name = "grpc_secure",
language = "c++",
public_hdrs = GRPC_PUBLIC_HDRS,
tags = ["nofixdeps"],
visibility = ["@grpc:public"],
deps = [
"config",
"gpr",
"grpc_alts_credentials",
"grpc_authorization_base",
"grpc_base",
"grpc_client_channel",
"grpc_codegen",
"grpc_credentials_util",
"grpc_external_account_credentials",
"grpc_fake_credentials",
"grpc_google_default_credentials",
"grpc_iam_credentials",
"grpc_insecure_credentials",
"grpc_jwt_credentials",
"grpc_local_credentials",
"grpc_oauth2_credentials",
"grpc_security_base",
"grpc_ssl_credentials",
"grpc_tls_credentials",
"grpc_trace",
"grpc_transport_chttp2_alpn",
"httpcli",
"httpcli_ssl_credentials",
"json",
"promise",
"ref_counted",
"ref_counted_ptr",
"slice",
"slice_refcount",
"sockaddr_utils",
"tsi_base",
"uri_parser",
"useful",
],
)
grpc_cc_library(
name = "tsi_ssl_types",
hdrs = [

24
CMakeLists.txt generated
Unescape View File

@ -1496,6 +1496,14 @@ foreach(_hdr
include/grpc/grpc_posix.h
include/grpc/grpc_security.h
include/grpc/grpc_security_constants.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/slice.h
include/grpc/impl/codegen/status.h
include/grpc/load_reporting.h
include/grpc/slice.h
include/grpc/slice_buffer.h
@ -2433,11 +2441,19 @@ foreach(_hdr
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/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/fork.h
include/grpc/impl/codegen/gpr_slice.h
include/grpc/impl/codegen/gpr_types.h
include/grpc/impl/codegen/grpc_types.h
include/grpc/impl/codegen/log.h
include/grpc/impl/codegen/port_platform.h
include/grpc/impl/codegen/propagation_bits.h
include/grpc/impl/codegen/slice.h
include/grpc/impl/codegen/status.h
include/grpc/impl/codegen/sync.h
include/grpc/impl/codegen/sync_abseil.h
include/grpc/impl/codegen/sync_custom.h
@ -2994,11 +3010,19 @@ foreach(_hdr
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/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/fork.h
include/grpc/impl/codegen/gpr_slice.h
include/grpc/impl/codegen/gpr_types.h
include/grpc/impl/codegen/grpc_types.h
include/grpc/impl/codegen/log.h
include/grpc/impl/codegen/port_platform.h
include/grpc/impl/codegen/propagation_bits.h
include/grpc/impl/codegen/slice.h
include/grpc/impl/codegen/status.h
include/grpc/impl/codegen/sync.h
include/grpc/impl/codegen/sync_abseil.h
include/grpc/impl/codegen/sync_custom.h

16
Makefile generated
Unescape View File

@ -1727,11 +1727,19 @@ PUBLIC_HEADERS_C += \
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/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/fork.h \
include/grpc/impl/codegen/gpr_slice.h \
include/grpc/impl/codegen/gpr_types.h \
include/grpc/impl/codegen/grpc_types.h \
include/grpc/impl/codegen/log.h \
include/grpc/impl/codegen/port_platform.h \
include/grpc/impl/codegen/propagation_bits.h \
include/grpc/impl/codegen/slice.h \
include/grpc/impl/codegen/status.h \
include/grpc/impl/codegen/sync.h \
include/grpc/impl/codegen/sync_abseil.h \
include/grpc/impl/codegen/sync_custom.h \
@ -2153,11 +2161,19 @@ PUBLIC_HEADERS_C += \
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/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/fork.h \
include/grpc/impl/codegen/gpr_slice.h \
include/grpc/impl/codegen/gpr_types.h \
include/grpc/impl/codegen/grpc_types.h \
include/grpc/impl/codegen/log.h \
include/grpc/impl/codegen/port_platform.h \
include/grpc/impl/codegen/propagation_bits.h \
include/grpc/impl/codegen/slice.h \
include/grpc/impl/codegen/status.h \
include/grpc/impl/codegen/sync.h \
include/grpc/impl/codegen/sync_abseil.h \
include/grpc/impl/codegen/sync_custom.h \

24
build_autogenerated.yaml generated
Unescape View File

@ -24,6 +24,14 @@ libs:
- include/grpc/grpc_posix.h
- include/grpc/grpc_security.h
- include/grpc/grpc_security_constants.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/slice.h
- include/grpc/impl/codegen/status.h
- include/grpc/load_reporting.h
- include/grpc/slice.h
- include/grpc/slice_buffer.h
@ -306,11 +314,19 @@ libs:
- 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/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/fork.h
- include/grpc/impl/codegen/gpr_slice.h
- include/grpc/impl/codegen/gpr_types.h
- include/grpc/impl/codegen/grpc_types.h
- include/grpc/impl/codegen/log.h
- include/grpc/impl/codegen/port_platform.h
- include/grpc/impl/codegen/propagation_bits.h
- include/grpc/impl/codegen/slice.h
- include/grpc/impl/codegen/status.h
- include/grpc/impl/codegen/sync.h
- include/grpc/impl/codegen/sync_abseil.h
- include/grpc/impl/codegen/sync_custom.h
@ -1818,11 +1834,19 @@ libs:
- 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/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/fork.h
- include/grpc/impl/codegen/gpr_slice.h
- include/grpc/impl/codegen/gpr_types.h
- include/grpc/impl/codegen/grpc_types.h
- include/grpc/impl/codegen/log.h
- include/grpc/impl/codegen/port_platform.h
- include/grpc/impl/codegen/propagation_bits.h
- include/grpc/impl/codegen/slice.h
- include/grpc/impl/codegen/status.h
- include/grpc/impl/codegen/sync.h
- include/grpc/impl/codegen/sync_abseil.h
- include/grpc/impl/codegen/sync_custom.h

13
test/core/security/BUILD
Unescape View File

@ -111,7 +111,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -126,7 +125,6 @@ grpc_cc_test(
"//:gpr",
"//:grpc",
"//:grpc_authorization_base",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -310,7 +308,6 @@ grpc_cc_test(
"//:gpr",
"//:grpc",
"//:grpc_base",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -335,7 +332,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -359,7 +355,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -373,7 +368,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -387,7 +381,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -411,7 +404,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -425,7 +417,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -440,7 +431,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -455,7 +445,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -469,7 +458,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],
@ -546,7 +534,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
"//test/core/util:grpc_test_util_base",
],

1
test/core/xds/BUILD
Unescape View File

@ -93,7 +93,6 @@ grpc_cc_test(
deps = [
"//:gpr",
"//:grpc",
"//:grpc_secure",
"//test/core/util:grpc_test_util",
],
)

Write Preview
Loading…
Cancel
Save