From ee3cca149948a3bd21310d3e7148a27c19246ff7 Mon Sep 17 00:00:00 2001
From: YoungSeok Yoon <youngseokyoon@google.com>
Date: Sun, 5 Apr 2020 18:07:00 -0700
Subject: [PATCH] Fix TFLite makefile build by downloading and compiling ruy
 correctly

PiperOrigin-RevId: 304936481
Change-Id: I12d903d65b5a47a6c1103e3c8a1f1b8042c764d6
---
 tensorflow/lite/tools/make/Makefile                 | 8 +++++++-
 tensorflow/lite/tools/make/download_dependencies.sh | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tensorflow/lite/tools/make/Makefile b/tensorflow/lite/tools/make/Makefile
index f5b86d0ff25..7a77cf2b3f5 100644
--- a/tensorflow/lite/tools/make/Makefile
+++ b/tensorflow/lite/tools/make/Makefile
@@ -119,7 +119,8 @@ $(wildcard tensorflow/lite/*.c) \
 $(wildcard tensorflow/lite/c/*.c) \
 $(wildcard tensorflow/lite/core/*.cc) \
 $(wildcard tensorflow/lite/core/api/*.cc) \
-$(wildcard tensorflow/lite/experimental/resource/*.cc)
+$(wildcard tensorflow/lite/experimental/resource/*.cc) \
+$(wildcard tensorflow/lite/tools/make/downloads/ruy/ruy/*.cc)
 ifneq ($(BUILD_TYPE),micro)
 CORE_CC_ALL_SRCS += \
 $(wildcard tensorflow/lite/kernels/*.cc) \
@@ -151,6 +152,11 @@ $(wildcard tensorflow/lite/*/*/*/example*.cc) \
 $(wildcard tensorflow/lite/*/*/*/test*.cc) \
 $(wildcard tensorflow/lite/*/*/*/*test.cc) \
 $(wildcard tensorflow/lite/*/*/*/*tool.cc) \
+$(wildcard tensorflow/lite/*/*/*/*/*/benchmark.cc) \
+$(wildcard tensorflow/lite/*/*/*/*/*/example*.cc) \
+$(wildcard tensorflow/lite/*/*/*/*/*/test*.cc) \
+$(wildcard tensorflow/lite/*/*/*/*/*/*test.cc) \
+$(wildcard tensorflow/lite/*/*/*/*/*/*tool.cc) \
 $(wildcard tensorflow/lite/kernels/*test_main.cc) \
 $(wildcard tensorflow/lite/kernels/*test_util*.cc) \
 tensorflow/lite/tflite_with_xnnpack.cc \
diff --git a/tensorflow/lite/tools/make/download_dependencies.sh b/tensorflow/lite/tools/make/download_dependencies.sh
index ea8e41b37d6..314f4fe6177 100755
--- a/tensorflow/lite/tools/make/download_dependencies.sh
+++ b/tensorflow/lite/tools/make/download_dependencies.sh
@@ -107,6 +107,7 @@ download_and_extract() {
 
 download_and_extract "${EIGEN_URL}" "${DOWNLOADS_DIR}/eigen" "${EIGEN_SHA}"
 download_and_extract "${GEMMLOWP_URL}" "${DOWNLOADS_DIR}/gemmlowp" "${GEMMLOWP_SHA}"
+download_and_extract "${RUY_URL}" "${DOWNLOADS_DIR}/ruy" "${RUY_SHA}"
 download_and_extract "${GOOGLETEST_URL}" "${DOWNLOADS_DIR}/googletest" "${GOOGLETEST_SHA}"
 download_and_extract "${ABSL_URL}" "${DOWNLOADS_DIR}/absl" "${ABSL_SHA}"
 download_and_extract "${NEON_2_SSE_URL}" "${DOWNLOADS_DIR}/neon_2_sse"