From b73bad5a5aaae94bfc112bfec3adc5fea8c006df Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Tue, 23 Aug 2016 12:17:58 -0800 Subject: [PATCH] Fix build breakage on Android Makefile build Change: 131088365 --- tensorflow/contrib/makefile/Makefile | 2 +- tensorflow/contrib/makefile/proto_text_pb_cc_files.txt | 1 + tensorflow/contrib/makefile/proto_text_pb_h_files.txt | 1 + tensorflow/contrib/makefile/tf_op_files.txt | 1 + tensorflow/contrib/makefile/tf_pb_text_files.txt | 1 + tensorflow/contrib/makefile/tf_proto_files.txt | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tensorflow/contrib/makefile/Makefile b/tensorflow/contrib/makefile/Makefile index e7c0488c2cd..6530d32feec 100644 --- a/tensorflow/contrib/makefile/Makefile +++ b/tensorflow/contrib/makefile/Makefile @@ -224,7 +224,7 @@ ifeq ($(TARGET),ANDROID) CXX := $(CC_PREFIX) $(NDK_ROOT)/toolchains/arm-linux-androideabi-4.9/prebuilt/$(OS_PATH)-x86_64/bin/arm-linux-androideabi-g++ CXXFLAGS +=\ --sysroot $(NDK_ROOT)/platforms/android-21/arch-arm \ --Wno-c++11-narrowing \ +-Wno-narrowing \ -march=armv7-a \ -fPIE diff --git a/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt b/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt index c680c0d04c6..2b2513e80fd 100644 --- a/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt +++ b/tensorflow/contrib/makefile/proto_text_pb_cc_files.txt @@ -19,6 +19,7 @@ tensorflow/core/framework/tensor.pb.cc tensorflow/core/framework/summary.pb.cc tensorflow/core/framework/step_stats.pb.cc tensorflow/core/framework/op_def.pb.cc +tensorflow/core/framework/node_def.pb.cc tensorflow/core/framework/log_memory.pb.cc tensorflow/core/framework/kernel_def.pb.cc tensorflow/core/framework/graph.pb.cc diff --git a/tensorflow/contrib/makefile/proto_text_pb_h_files.txt b/tensorflow/contrib/makefile/proto_text_pb_h_files.txt index 29aa8a8ef2c..b6028734392 100644 --- a/tensorflow/contrib/makefile/proto_text_pb_h_files.txt +++ b/tensorflow/contrib/makefile/proto_text_pb_h_files.txt @@ -19,6 +19,7 @@ tensorflow/core/framework/tensor.pb.h tensorflow/core/framework/summary.pb.h tensorflow/core/framework/step_stats.pb.h tensorflow/core/framework/op_def.pb.h +tensorflow/core/framework/node_def.pb.h tensorflow/core/framework/log_memory.pb.h tensorflow/core/framework/kernel_def.pb.h tensorflow/core/framework/graph.pb.h diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt index 4a92a2f0004..5c0128db787 100644 --- a/tensorflow/contrib/makefile/tf_op_files.txt +++ b/tensorflow/contrib/makefile/tf_op_files.txt @@ -12,6 +12,7 @@ tensorflow/core/kernels/tile_ops_cpu_impl_2.cc tensorflow/core/kernels/tile_ops_cpu_impl_3.cc tensorflow/core/kernels/tile_ops_cpu_impl_4.cc tensorflow/core/kernels/tile_ops_cpu_impl_5.cc +tensorflow/core/kernels/tile_ops_cpu_impl_6.cc tensorflow/core/kernels/strided_slice_op_inst_6.cc tensorflow/core/kernels/strided_slice_op_inst_5.cc tensorflow/core/kernels/strided_slice_op_inst_4.cc diff --git a/tensorflow/contrib/makefile/tf_pb_text_files.txt b/tensorflow/contrib/makefile/tf_pb_text_files.txt index ff400d16fa9..9db31e5d235 100644 --- a/tensorflow/contrib/makefile/tf_pb_text_files.txt +++ b/tensorflow/contrib/makefile/tf_pb_text_files.txt @@ -12,6 +12,7 @@ tensorflow/core/framework/tensor.pb_text.cc tensorflow/core/framework/summary.pb_text.cc tensorflow/core/framework/step_stats.pb_text.cc tensorflow/core/framework/op_def.pb_text.cc +tensorflow/core/framework/node_def.pb_text.cc tensorflow/core/framework/log_memory.pb_text.cc tensorflow/core/framework/kernel_def.pb_text.cc tensorflow/core/framework/graph.pb_text.cc diff --git a/tensorflow/contrib/makefile/tf_proto_files.txt b/tensorflow/contrib/makefile/tf_proto_files.txt index a40bb046b9b..1e048bc6373 100644 --- a/tensorflow/contrib/makefile/tf_proto_files.txt +++ b/tensorflow/contrib/makefile/tf_proto_files.txt @@ -19,6 +19,7 @@ tensorflow/core/framework/tensor.proto tensorflow/core/framework/summary.proto tensorflow/core/framework/step_stats.proto tensorflow/core/framework/op_def.proto +tensorflow/core/framework/node_def.proto tensorflow/core/framework/log_memory.proto tensorflow/core/framework/kernel_def.proto tensorflow/core/framework/graph.proto