From 72d4ea3f96eab1930d75891cb5df15ea7fb0e614 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris@google.com>
Date: Fri, 27 Jul 2018 19:17:07 +0000
Subject: Revert "Upgrade nanopb to 0.3.9.1"

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
---
 tools/make_linux_package.sh | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'tools/make_linux_package.sh')

diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh
index 0bcba7d..332c281 100755
--- a/tools/make_linux_package.sh
+++ b/tools/make_linux_package.sh
@@ -3,8 +3,6 @@
 # Run this script in the top nanopb directory to create a binary package
 # for Linux users.
 
-# Requires: protobuf, python-protobuf, pyinstaller
-
 set -e
 set -x
 
@@ -20,21 +18,20 @@ git archive HEAD | tar x -C $DEST
 # Rebuild the Python .proto files
 make -BC $DEST/generator/proto
 
-# Package the Python libraries
-( cd $DEST/generator; pyinstaller nanopb_generator.py )
-mv $DEST/generator/dist/nanopb_generator $DEST/generator-bin
+# Make the nanopb generator available as a protoc plugin
+cp $DEST/generator/nanopb_generator.py $DEST/generator/protoc-gen-nanopb.py
 
-# Remove temp files
-rm -rf $DEST/generator/dist $DEST/generator/build $DEST/generator/nanopb_generator.spec
+# Package the Python libraries
+( cd $DEST/generator; bbfreeze nanopb_generator.py protoc-gen-nanopb.py )
+mv $DEST/generator/dist $DEST/generator-bin
 
-# Make the nanopb generator available as a protoc plugin
-cp $DEST/generator-bin/nanopb_generator $DEST/generator-bin/protoc-gen-nanopb
+# Remove temp file
+rm $DEST/generator/protoc-gen-nanopb.py
 
 # Package the protoc compiler
 cp `which protoc` $DEST/generator-bin/protoc.bin
 LIBPROTOC=$(ldd `which protoc` | grep -o '/.*libprotoc[^ ]*')
-LIBPROTOBUF=$(ldd `which protoc` | grep -o '/.*libprotobuf[^ ]*')
-cp $LIBPROTOC $LIBPROTOBUF $DEST/generator-bin/
+cp $LIBPROTOC $DEST/generator-bin/
 cat > $DEST/generator-bin/protoc << EOF
 #!/bin/bash
 SCRIPTDIR=\$(dirname "\$0")
@@ -44,9 +41,6 @@ exec "\$SCRIPTDIR/protoc.bin" "\$@"
 EOF
 chmod +x $DEST/generator-bin/protoc
 
-# Remove debugging symbols to reduce size of package
-( cd $DEST/generator-bin; strip *.so *.so.* )
-
 # Tar it all up
 ( cd dist; tar -czf $VERSION.tar.gz $VERSION )
 
-- 
cgit v1.2.3