Skip to content

Commit

Permalink
Add arm protobuf static build and update build scripts. Untested but …
Browse files Browse the repository at this point in the history
…builds
  • Loading branch information
lmagder committed Nov 30, 2016
1 parent f08f22b commit 161c91f
Show file tree
Hide file tree
Showing 73 changed files with 27,950 additions and 15 deletions.
File renamed without changes.
2 changes: 2 additions & 0 deletions hu/generated.x64/.gitignore
@@ -0,0 +1,2 @@
*
!.gitignore
4 changes: 2 additions & 2 deletions hu/hu_aap.h
@@ -1,5 +1,5 @@
#include "hu_uti.h"
#include "generated/hu.pb.h"
#include "hu.pb.h"

int hu_aap_mic_get ();
int hu_aap_out_get (int chan);
Expand Down Expand Up @@ -33,7 +33,7 @@ enum class HU_PROTOCOL_MESSAGE : uint16_t
VersionResponse = 0x0002,
SSLHandshake = 0x0003,
ServiceDiscoveryRequest = 0x0005,
ServiceDiscoveryResponse = 0x0006,
ServiceDiscoveryResponse = 0x0006,
ChannelOpenRequest = 0x0007,
ChannelOpenResponse = 0x0008,
PingRequest = 0x000b,
Expand Down
21 changes: 16 additions & 5 deletions mazda/Makefile
@@ -1,16 +1,18 @@
TOP = ..

M3TOOLCHAIN=./m3-toolchain
PROTOTOOLCHAIN=./protobuf-2.6.1-arm
CC=$(M3TOOLCHAIN)/bin/arm-cortexa9_neon-linux-gnueabi-gcc
CXX=$(M3TOOLCHAIN)/bin/arm-cortexa9_neon-linux-gnueabi-g++
LD=$(M3TOOLCHAIN)/bin/arm-cortexa9_neon-linux-gnueabi-ld
SYSROOT=$(M3TOOLCHAIN)/arm-cortexa9_neon-linux-gnueabi/sysroot

INCLUDES=$(shell ./pkg-config-wrapper $(SYSROOT) --cflags gstreamer-0.10 gstreamer-app-0.10 gstreamer-video-0.10 dbus-1 libusb-1.0 libcrypto openssl) -I$(TOP)/hu -Imazda-connector
INCLUDES=$(shell ./pkg-config-wrapper $(SYSROOT) --cflags gstreamer-0.10 gstreamer-app-0.10 gstreamer-video-0.10 dbus-1 libusb-1.0 libcrypto openssl) -I$(TOP)/hu -I$(TOP)/hu/generated.arm -Imazda-connector -I$(PROTOTOOLCHAIN)/include
CFLAGS=-O3 --sysroot=$(SYSROOT)
CXXFLAGS=$(CFLAGS) -std=c++11 -static-libstdc++

LFLAGS= --sysroot=$(SYSROOT) -static-libstdc++ $(shell ./pkg-config-wrapper $(SYSROOT) --libs gstreamer-0.10 gstreamer-app-0.10 gstreamer-video-0.10 dbus-1 libusb-1.0 libcrypto openssl)
LFLAGS= --sysroot=$(SYSROOT) -static-libstdc++ $(shell ./pkg-config-wrapper $(SYSROOT) --libs gstreamer-0.10 gstreamer-app-0.10 gstreamer-video-0.10 dbus-1 libusb-1.0 libcrypto openssl) -L$(PROTOTOOLCHAIN)/lib -lprotobuf
LFLAGS_IF= --sysroot=$(SYSROOT) -static-libstdc++ $(shell ./pkg-config-wrapper $(SYSROOT) --libs dbus-1)
TOP = ..

#headunit binary
SRCS = $(TOP)/hu/hu_aad.cpp
Expand All @@ -19,6 +21,7 @@ SRCS += $(TOP)/hu/hu_ssl.cpp
SRCS += $(TOP)/hu/hu_usb.cpp
SRCS += $(TOP)/hu/hu_uti.cpp
SRCS += $(TOP)/hu/hu_tcp.cpp
SRCS += $(TOP)/hu/generated.arm/hu.pb.cc
SRCS += main.cpp

OBJS = $(addsuffix .arm.o, $(basename $(SRCS)))
Expand All @@ -34,22 +37,30 @@ DEPS_IF = $(addsuffix .arm.d, $(basename $(SRCS_IF)))
#input_filter binary
APP_IF = input_filter

all: $(APP) $(APP_IF)
all: proto $(APP) $(APP_IF)

proto: $(TOP)/hu/generated.arm/hu.pb.cc

$(APP): $(OBJS)
$(CXX) -MD -g -o $(APP) $(OBJS) $(LFLAGS)

$(APP_IF): $(OBJS_IF)
$(CXX) -MD -g -o $(APP_IF) $(OBJS_IF) $(LFLAGS_IF)

$(TOP)/hu/generated.arm/hu.pb.cc $(TOP)/hu/generated.arm/hu.pb.h: $(TOP)/hu/hu.proto
$(PROTOTOOLCHAIN)/bin/protoc $< --proto_path=$(TOP)/hu/ --cpp_out=$(TOP)/hu/generated.arm/

%.arm.o : %.c
$(CC) -MD -g $(CFLAGS) $(INCLUDES) -c $< -o $@

%.arm.o : %.cpp
$(CXX) -MD -g $(CXXFLAGS) $(INCLUDES) -c $< -o $@

%.arm.o : %.cc
$(CXX) -MD -g $(CXXFLAGS) $(INCLUDES) -c $< -o $@

clean:
rm -f *~ $(OBJS) $(OBJS_IF) $(APP) $(APP_IF) $(DEPS) $(DEPS_IF)
rm -f *~ $(TOP)/hu/generated.arm/* $(OBJS) $(OBJS_IF) $(APP) $(APP_IF) $(DEPS) $(DEPS_IF)

install: all
cp -a -f input_filter installer/config/androidauto/data_persist/dev/bin/
Expand Down
Binary file not shown.
Binary file added mazda/protobuf-2.6.1-arm/bin/protoc
Binary file not shown.
14 changes: 14 additions & 0 deletions mazda/protobuf-2.6.1-arm/build-libproto.sh
@@ -0,0 +1,14 @@
#update the temp paths as required
OUTDIR=/home/lucas/protobuild
M3TOOLCHAIN=/home/lucas/m3-toolchain-lmagder

./configure --prefix=$OUTDIR --enable-static --disable-shared CXXFLAGS=-static-libstdc++ LDFLAGS=-static-libstdc++
make install CXXFLAGS=-static-libstdc++ LDFLAGS=-static-libstdc++
make clean
rm -r $OUTDIR/lib/*
rm -r $OUTDIR/include/*
#copy arm version on top, old protoc stays since it doesn't have the target prefix
./configure --prefix=$OUTDIR --enable-static --disable-shared --with-sysroot=$M3TOOLCHAIN/arm-cortexa9_neon-linux-gnueabi/sysroot --target=arm-cortexa9_neon-linux-gnueabi --host=arm-cortexa9_neon-linux-gnueabi --enable-cross-compile --with-protoc=$OUTDIR/bin/protoc PATH=$PATH:$M3TOOLCHAIN/bin CXXFLAGS=-static-libstdc++ LDFLAGS=-static-libstdc++
make install PATH=$PATH:$M3TOOLCHAIN/bin CXXFLAGS=-static-libstdc++ LDFLAGS=-static-libstdc++


@@ -0,0 +1,145 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

// Author: kenton@google.com (Kenton Varda)
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
//
// Defines the abstract interface implemented by each of the language-specific
// code generators.

#ifndef GOOGLE_PROTOBUF_COMPILER_CODE_GENERATOR_H__
#define GOOGLE_PROTOBUF_COMPILER_CODE_GENERATOR_H__

#include <google/protobuf/stubs/common.h>
#include <string>
#include <vector>
#include <utility>

namespace google {
namespace protobuf {

namespace io { class ZeroCopyOutputStream; }
class FileDescriptor;

namespace compiler {

// Defined in this file.
class CodeGenerator;
class GeneratorContext;

// The abstract interface to a class which generates code implementing a
// particular proto file in a particular language. A number of these may
// be registered with CommandLineInterface to support various languages.
class LIBPROTOC_EXPORT CodeGenerator {
public:
inline CodeGenerator() {}
virtual ~CodeGenerator();

// Generates code for the given proto file, generating one or more files in
// the given output directory.
//
// A parameter to be passed to the generator can be specified on the
// command line. This is intended to be used by Java and similar languages
// to specify which specific class from the proto file is to be generated,
// though it could have other uses as well. It is empty if no parameter was
// given.
//
// Returns true if successful. Otherwise, sets *error to a description of
// the problem (e.g. "invalid parameter") and returns false.
virtual bool Generate(const FileDescriptor* file,
const string& parameter,
GeneratorContext* generator_context,
string* error) const = 0;

private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CodeGenerator);
};

// CodeGenerators generate one or more files in a given directory. This
// abstract interface represents the directory to which the CodeGenerator is
// to write and other information about the context in which the Generator
// runs.
class LIBPROTOC_EXPORT GeneratorContext {
public:
inline GeneratorContext() {}
virtual ~GeneratorContext();

// Opens the given file, truncating it if it exists, and returns a
// ZeroCopyOutputStream that writes to the file. The caller takes ownership
// of the returned object. This method never fails (a dummy stream will be
// returned instead).
//
// The filename given should be relative to the root of the source tree.
// E.g. the C++ generator, when generating code for "foo/bar.proto", will
// generate the files "foo/bar.pb.h" and "foo/bar.pb.cc"; note that
// "foo/" is included in these filenames. The filename is not allowed to
// contain "." or ".." components.
virtual io::ZeroCopyOutputStream* Open(const string& filename) = 0;

// Similar to Open() but the output will be appended to the file if exists
virtual io::ZeroCopyOutputStream* OpenForAppend(const string& filename);

// Creates a ZeroCopyOutputStream which will insert code into the given file
// at the given insertion point. See plugin.proto (plugin.pb.h) for more
// information on insertion points. The default implementation
// assert-fails -- it exists only for backwards-compatibility.
//
// WARNING: This feature is currently EXPERIMENTAL and is subject to change.
virtual io::ZeroCopyOutputStream* OpenForInsert(
const string& filename, const string& insertion_point);

// Returns a vector of FileDescriptors for all the files being compiled
// in this run. Useful for languages, such as Go, that treat files
// differently when compiled as a set rather than individually.
virtual void ListParsedFiles(vector<const FileDescriptor*>* output);

private:
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(GeneratorContext);
};

// The type GeneratorContext was once called OutputDirectory. This typedef
// provides backward compatibility.
typedef GeneratorContext OutputDirectory;

// Several code generators treat the parameter argument as holding a
// list of options separated by commas. This helper function parses
// a set of comma-delimited name/value pairs: e.g.,
// "foo=bar,baz,qux=corge"
// parses to the pairs:
// ("foo", "bar"), ("baz", ""), ("qux", "corge")
extern void ParseGeneratorParameter(const string&,
vector<pair<string, string> >*);

} // namespace compiler
} // namespace protobuf

} // namespace google
#endif // GOOGLE_PROTOBUF_COMPILER_CODE_GENERATOR_H__

0 comments on commit 161c91f

Please sign in to comment.