Skip to content

Commit

Permalink
Remove overrideLatest from grpc-java deps, update build config
Browse files Browse the repository at this point in the history 
Change-Id: Ib0a493b4e1475af3a4ccb1ed3877a8d35cb2daea
Bug: b:245087054
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3873634
Reviewed-by: Xinghui Lu <xinghuilu@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: David Bengoa <dbengoa@google.com>
Cr-Commit-Position: refs/heads/main@{#1056328}
  • Loading branch information
David Bengoa authored and Chromium LUCI CQ committed Oct 7, 2022
1 parent a05178d commit b846350
Show file tree
Hide file tree
Showing 42 changed files with 3,606 additions and 66 deletions.
96 changes: 92 additions & 4 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2503,6 +2503,17 @@ deps = {
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/com_google_android_annotations': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_android_annotations',
'version': 'version:2@4.1.1.4.cr1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework': {
'packages': [
{
Expand Down Expand Up @@ -2837,7 +2848,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_code_gson_gson',
'version': 'version:2@2.8.0.cr1',
'version': 'version:2@2.9.0.cr1',
},
],
'condition': 'checkout_android',
Expand Down Expand Up @@ -3134,7 +3145,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava_android',
'version': 'version:2@31.0-android.cr1',
'version': 'version:2@31.1-android.cr1',
},
],
'condition': 'checkout_android',
Expand Down Expand Up @@ -3178,7 +3189,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite',
'version': 'version:2@3.19.3.cr1',
'version': 'version:2@3.21.1.cr1',
},
],
'condition': 'checkout_android',
Expand Down Expand Up @@ -3229,6 +3240,83 @@ deps = {
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/io_grpc_grpc_api': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_api',
'version': 'version:2@1.49.0.cr1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/io_grpc_grpc_binder': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_binder',
'version': 'version:2@1.49.0.cr1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/io_grpc_grpc_context': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_context',
'version': 'version:2@1.49.0.cr1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/io_grpc_grpc_core': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_core',
'version': 'version:2@1.49.0.cr1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite',
'version': 'version:2@1.49.0.cr1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/io_grpc_grpc_stub': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/io_grpc_grpc_stub',
'version': 'version:2@1.49.0.cr1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/io_perfmark_perfmark_api': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/io_perfmark_perfmark_api',
'version': 'version:2@0.25.0.cr1',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': {
'packages': [
{
Expand Down Expand Up @@ -3376,7 +3464,7 @@ deps = {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations',
'version': 'version:2@1.17.cr1',
'version': 'version:2@1.21.cr1',
},
],
'condition': 'checkout_android',
Expand Down
44 changes: 35 additions & 9 deletions build/config/android/rules.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4357,6 +4357,10 @@ if (enable_java_templates) {
# absolute paths, such as for third_party or generated .proto files.
# http://crbug.com/691451 tracks fixing this.
#
# generator_plugin_label (optional)
# GN label for plugin executable which generates custom cc stubs.
# Don't specify a toolchain, host toolchain is assumed.
#
# Example:
# proto_java_library("foo_proto_java") {
# proto_path = "src/foo"
Expand All @@ -4383,15 +4387,37 @@ if (enable_java_templates) {
depfile = "$target_gen_dir/$target_name.d"
outputs = [ _srcjar_path ]
args = [
"--depfile",
rebase_path(depfile, root_build_dir),
"--protoc",
rebase_path(android_protoc_bin, root_build_dir),
"--proto-path",
rebase_path(invoker.proto_path, root_build_dir),
"--srcjar",
rebase_path(_srcjar_path, root_build_dir),
] + rebase_path(sources, root_build_dir)
"--depfile",
rebase_path(depfile, root_build_dir),
"--protoc",
rebase_path(android_protoc_bin, root_build_dir),
"--proto-path",
rebase_path(invoker.proto_path, root_build_dir),
"--srcjar",
rebase_path(_srcjar_path, root_build_dir),
]

if (defined(invoker.generator_plugin_label)) {
if (host_os == "win") {
_host_executable_suffix = ".exe"
} else {
_host_executable_suffix = ""
}

_plugin_host_label =
invoker.generator_plugin_label + "($host_toolchain)"
_plugin_path =
get_label_info(_plugin_host_label, "root_out_dir") + "/" +
get_label_info(_plugin_host_label, "name") + _host_executable_suffix
args += [
"--plugin",
rebase_path(_plugin_path, root_build_dir),
]
deps += [ _plugin_host_label ]
inputs = [ _plugin_path ]
}

args += rebase_path(sources, root_build_dir)

if (defined(invoker.import_dirs)) {
foreach(_import_dir, invoker.import_dirs) {
Expand Down
16 changes: 12 additions & 4 deletions build/protoc_java.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def main(argv):
parser = argparse.ArgumentParser()
build_utils.AddDepfileOption(parser)
parser.add_argument('--protoc', required=True, help='Path to protoc binary.')
parser.add_argument('--plugin', help='Path to plugin executable')
parser.add_argument('--proto-path',
required=True,
help='Path to proto directory.')
Expand All @@ -65,15 +66,22 @@ def main(argv):
_EnforceJavaPackage(options.protos)

with build_utils.TempDir() as temp_dir:
out_arg = '--java_out=lite:' + temp_dir
protoc_args = []

proto_path_args = ['--proto_path', options.proto_path]
generator = 'java'
if options.plugin:
generator = 'plugin'
protoc_args += ['--plugin', 'protoc-gen-plugin=' + options.plugin]

protoc_args += ['--proto_path', options.proto_path]
for path in options.import_dir:
proto_path_args += ["--proto_path", path]
protoc_args += ['--proto_path', path]

protoc_args += ['--' + generator + '_out=lite:' + temp_dir]

# Generate Java files using protoc.
build_utils.CheckOutput(
[options.protoc] + proto_path_args + [out_arg] + options.protos,
[options.protoc] + protoc_args + options.protos,
# protoc generates superfluous warnings about LITE_RUNTIME deprecation
# even though we are using the new non-deprecated method.
stderr_filter=lambda output: build_utils.FilterLines(
Expand Down
Loading

0 comments on commit b846350

Please sign in to comment.