Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 492e0647 authored by Yu Shan's avatar Yu Shan Committed by android-build-merger
Browse files

Merge "Use prebuilt nanopb_generator.py." 

am: fb5314a2

Change-Id: I56c72d4d941188896694de4d75d93e8dad998b01
parents 6f0129d2 fb5314a2

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ ifneq (,$(filter nanopb-c nanopb-c-enable_malloc, $(LOCAL_PROTOC_OPTIMIZE_TYPE)) 
my_proto_source_suffix := .c

my_proto_c_includes := external/nanopb-c

my_protoc_flags := --nanopb_out=$(proto_gen_dir) \

    --plugin=external/nanopb-c/generator/protoc-gen-nanopb

    --plugin=$(HOST_OUT_EXECUTABLES)/protoc-gen-nanopb

my_protoc_deps := $(NANOPB_SRCS) $(proto_sources_fullpath:%.proto=%.options)

else

my_proto_source_suffix := $(LOCAL_CPP_EXTENSION)

core/config.mk

+1 −4
Original line number Diff line number Diff line
@@ -651,10 +651,7 @@ else 
BREAKPAD_GENERATE_SYMBOLS := false

endif

PROTOC := $(HOST_OUT_EXECUTABLES)/aprotoc$(HOST_EXECUTABLE_SUFFIX)

NANOPB_SRCS := external/nanopb-c/generator/protoc-gen-nanopb \

    $(wildcard external/nanopb-c/generator/*.py \

               external/nanopb-c/generator/google/*.py \

               external/nanopb-c/generator/proto/*.py)

NANOPB_SRCS := $(HOST_OUT_EXECUTABLES)/protoc-gen-nanopb

VTSC := $(HOST_OUT_EXECUTABLES)/vtsc$(HOST_EXECUTABLE_SUFFIX)

MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX)

MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(HOST_EXECUTABLE_SUFFIX)