Fix import paths of protos in //editions

This is an alternative to https://github.com/protocolbuffers/protobuf/pull/18247.

PiperOrigin-RevId: 676453938
pull/18408/head
Mike Kruskal 4 months ago committed by Copybara-Service
parent dc23fedbf3
commit cb86ccd7a1
  1. 2
      editions/codegen_tests/proto2_import.proto
  2. 2
      editions/codegen_tests/proto2_proto3_enum.proto
  3. 2
      editions/codegen_tests/proto3_import.proto
  4. 2
      editions/golden/editions_transform_proto2.proto
  5. 2
      editions/golden/simple_proto2_import.proto
  6. 2
      editions/proto/editions_transform_proto2.proto

@ -9,7 +9,7 @@ syntax = "proto2";
package protobuf_editions_test.proto2;
import "google/protobuf/editions/codegen_tests/proto2_optional.proto";
import "editions/codegen_tests/proto2_optional.proto";
message Proto2ImportMessage {
optional Proto2Optional sub_message_field = 1;

@ -9,7 +9,7 @@ syntax = "proto2";
package protobuf_editions_test.proto2;
import "google/protobuf/editions/codegen_tests/proto3_enum.proto";
import "editions/codegen_tests/proto3_enum.proto";
message Proto2ImportedEnumMessage {
optional protobuf_editions_test.proto3.Proto3Enum enum_field = 1;

@ -9,7 +9,7 @@ syntax = "proto3";
package protobuf_editions_test.proto3;
import "google/protobuf/editions/codegen_tests/proto3_implicit.proto";
import "editions/codegen_tests/proto3_implicit.proto";
message Proto3ImportMessage {
Proto3Implicit sub_message_field = 1;

@ -17,7 +17,7 @@ package protobuf_editions_test;
import "net/proto/proto1_features.proto";
import "google/protobuf/java_features.proto";
import "google/protobuf/cpp_features.proto";
import "google/protobuf/editions/proto/editions_transform_proto3.proto";
import "editions/proto/editions_transform_proto3.proto";
option features.repeated_field_encoding = EXPANDED;
option features.utf8_validation = NONE;

@ -9,7 +9,7 @@ syntax = "proto2";
package protobuf_editions_test.golden;
import "google/protobuf/editions/golden/simple_proto2.proto";
import "editions/golden/simple_proto2.proto";
message AnotherMessage {
optional SimpleProto2 field = 1;

@ -7,7 +7,7 @@
syntax = "proto2";
import "google/protobuf/editions/proto/editions_transform_proto3.proto";
import "editions/proto/editions_transform_proto3.proto";
// This file contains various edge cases we've collected from migrating real
// protos in order to lock down the transformations.

Loading…
Cancel
Save