diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/variations/proto | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/variations/proto')
4 files changed, 16 insertions, 0 deletions
diff --git a/chromium/components/variations/proto/BUILD.gn b/chromium/components/variations/proto/BUILD.gn index 2de83c52b2f..e68dba914cd 100644 --- a/chromium/components/variations/proto/BUILD.gn +++ b/chromium/components/variations/proto/BUILD.gn @@ -4,6 +4,19 @@ import("//third_party/protobuf/proto_library.gni") +if (is_android) { + import("//build/config/android/rules.gni") + + proto_java_library("proto_java") { + proto_path = "." + sources = [ + "client_variations.proto", + "study.proto", + "variations_seed.proto", + ] + } +} + proto_library("proto") { sources = [ "client_variations.proto", diff --git a/chromium/components/variations/proto/client_variations.proto b/chromium/components/variations/proto/client_variations.proto index fbb3367e0bf..38b02837c44 100644 --- a/chromium/components/variations/proto/client_variations.proto +++ b/chromium/components/variations/proto/client_variations.proto @@ -7,6 +7,7 @@ syntax = "proto2"; option optimize_for = LITE_RUNTIME; +option java_package = "org.chromium.components.variations"; package variations; diff --git a/chromium/components/variations/proto/study.proto b/chromium/components/variations/proto/study.proto index 0e891106904..3c4bb0f85fc 100644 --- a/chromium/components/variations/proto/study.proto +++ b/chromium/components/variations/proto/study.proto @@ -5,6 +5,7 @@ syntax = "proto2"; option optimize_for = LITE_RUNTIME; +option java_package = "org.chromium.components.variations"; package variations; diff --git a/chromium/components/variations/proto/variations_seed.proto b/chromium/components/variations/proto/variations_seed.proto index 0659414e39c..6b21dc2a45c 100644 --- a/chromium/components/variations/proto/variations_seed.proto +++ b/chromium/components/variations/proto/variations_seed.proto @@ -5,6 +5,7 @@ syntax = "proto2"; option optimize_for = LITE_RUNTIME; +option java_package = "org.chromium.components.variations"; package variations; |