diff options
author | Christopher Ferris <cferris@google.com> | 2018-07-27 19:17:07 +0000 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2018-07-27 12:33:26 -0700 |
commit | 72d4ea3f96eab1930d75891cb5df15ea7fb0e614 (patch) | |
tree | c28e65883c2587f3f19a80e40020ad89ba49dabd /tests/regression/issue_118 | |
parent | 798b76ea4d3564d2b92fc84da3cbedf0fbdba580 (diff) | |
download | nanopb-c-72d4ea3f96eab1930d75891cb5df15ea7fb0e614.tar.gz |
Revert "Upgrade nanopb to 0.3.9.1"android-n-iot-release-smart-display-r2
This reverts commit 56ebba603b8b913261a40f3f61561bb728e3eaa5.
Reason for revert: Caused build failures.
Examples of build failures:
FAILED: out/target/product/vsoc_x86/gen/STATIC_LIBRARIES/librilutils_static_intermediates/proto/hardware/ril/librilutils/proto/sap-api.pb.c
/bin/bash -c "(PATH=\$PATH:out/host/linux-x86/bin out/host/linux-x86/bin/aprotoc --proto_path=. --nanopb_out=out/target/product/vsoc_x86/gen/STATIC_LIBRARIES/librilutils_static_intermediates/proto --plugin=external/nanopb-c/generator/protoc-gen-nanopb hardware/ril/librilutils/proto/sap-api.proto )"
[libprotobuf WARNING external/protobuf/src/google/protobuf/compiler/parser.cc:547] No syntax specified for the proto file: hardware/ril/librilutils/proto/sap-api.proto. Please use 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. (Defaulted to proto2 syntax.)
Change-Id: Id862b050b2de4410bc9facf6d9920d3e878b227e
Diffstat (limited to 'tests/regression/issue_118')
-rw-r--r-- | tests/regression/issue_118/SConscript | 12 | ||||
-rw-r--r-- | tests/regression/issue_118/enumdef.proto | 8 | ||||
-rw-r--r-- | tests/regression/issue_118/enumuse.proto | 7 |
3 files changed, 0 insertions, 27 deletions
diff --git a/tests/regression/issue_118/SConscript b/tests/regression/issue_118/SConscript deleted file mode 100644 index 833d9de..0000000 --- a/tests/regression/issue_118/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -# Regression test for Issue 118: Short enum names in imported proto files are not honoured - -Import("env") -env = env.Clone() -env.Append(PROTOCPATH = "#regression/issue_118") - -env.NanopbProto("enumdef") -env.Object('enumdef.pb.c') - -env.NanopbProto(["enumuse", "enumdef.proto"]) -env.Object('enumuse.pb.c') - diff --git a/tests/regression/issue_118/enumdef.proto b/tests/regression/issue_118/enumdef.proto deleted file mode 100644 index 46845bc..0000000 --- a/tests/regression/issue_118/enumdef.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto2"; - -import 'nanopb.proto'; - -enum MyEnum { - option (nanopb_enumopt).long_names = false; - FOOBAR = 1; -} diff --git a/tests/regression/issue_118/enumuse.proto b/tests/regression/issue_118/enumuse.proto deleted file mode 100644 index 4afc452..0000000 --- a/tests/regression/issue_118/enumuse.proto +++ /dev/null @@ -1,7 +0,0 @@ -syntax = "proto2"; - -import 'enumdef.proto'; - -message MyMessage { - required MyEnum myenum = 1 [default = FOOBAR]; -} |