Commit 228e165e authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

android_deps: Ignoring prebuilt protos in proto runtime library

Bug: 1103399
Change-Id: I99cacadf2c0ea3e65b6e9dc8a8d127536114f14e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2293174
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791490}
parent acd6dce3
...@@ -1519,6 +1519,26 @@ java_prebuilt("com_google_protobuf_protobuf_javalite_java") { ...@@ -1519,6 +1519,26 @@ java_prebuilt("com_google_protobuf_protobuf_javalite_java") {
"libs/com_google_protobuf_protobuf_javalite/protobuf-javalite-3.12.2.jar" "libs/com_google_protobuf_protobuf_javalite/protobuf-javalite-3.12.2.jar"
output_name = "com_google_protobuf_protobuf_javalite" output_name = "com_google_protobuf_protobuf_javalite"
supports_android = true supports_android = true
# Prebuilt protos in the runtime library.
# If you want to use these protos, you should create a proto_java_library
# target for them. See crbug.com/1103399 for discussion.
jar_excluded_patterns = [
"com/google/protobuf/Any*",
"com/google/protobuf/Api*",
"com/google/protobuf/Duration*",
"com/google/protobuf/Empty*",
"com/google/protobuf/FieldMask*",
"com/google/protobuf/SourceContext*",
"com/google/protobuf/Struct\$1.class",
"com/google/protobuf/Struct\$Builder.class",
"com/google/protobuf/Struct.class",
"com/google/protobuf/StructOrBuilder.class",
"com/google/protobuf/StructProto.class",
"com/google/protobuf/Timestamp*",
"com/google/protobuf/Type*",
"com/google/protobuf/Wrappers*",
]
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
......
...@@ -445,6 +445,27 @@ class BuildConfigGenerator extends DefaultTask { ...@@ -445,6 +445,27 @@ class BuildConfigGenerator extends DefaultTask {
sb.append(' # Ignore the dependency to org.apache.http.legacy. See crbug.com/1084879.\n') sb.append(' # Ignore the dependency to org.apache.http.legacy. See crbug.com/1084879.\n')
sb.append(' ignore_manifest = true\n') sb.append(' ignore_manifest = true\n')
break break
case 'com_google_protobuf_protobuf_javalite':
sb.append(' # Prebuilt protos in the runtime library.\n')
sb.append(' # If you want to use these protos, you should create a proto_java_library\n')
sb.append(' # target for them. See crbug.com/1103399 for discussion.\n')
sb.append(' jar_excluded_patterns = [\n')
sb.append(' "com/google/protobuf/Any*",\n')
sb.append(' "com/google/protobuf/Api*",\n')
sb.append(' "com/google/protobuf/Duration*",\n')
sb.append(' "com/google/protobuf/Empty*",\n')
sb.append(' "com/google/protobuf/FieldMask*",\n')
sb.append(' "com/google/protobuf/SourceContext*",\n')
sb.append(' "com/google/protobuf/Struct\\\\\\$1.class",\n')
sb.append(' "com/google/protobuf/Struct\\\\\\$Builder.class",\n')
sb.append(' "com/google/protobuf/Struct.class",\n')
sb.append(' "com/google/protobuf/StructOrBuilder.class",\n')
sb.append(' "com/google/protobuf/StructProto.class",\n')
sb.append(' "com/google/protobuf/Timestamp*",\n')
sb.append(' "com/google/protobuf/Type*",\n')
sb.append(' "com/google/protobuf/Wrappers*",\n')
sb.append(' ]')
break
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment