From 59cd56ec820ea2eb2aa3409f95db55c1ea0104c9 Mon Sep 17 00:00:00 2001
From: Himanshu Jaju <himanshujaju@google.com>
Date: Thu, 2 Jul 2020 19:54:23 +0100
Subject: [PATCH] Change smhasher path

Changes the smhasher path to "smhasher/src/file" from "smhasher/file"
for easier import in Chromium land.

Change-Id: Ide6aa844fd8f37c9100e89d6a0bcb945b0860227
---
 cmake/CMakeLists-smhasher.txt                | 2 +-
 cmake/local_setup_smhasher.cmake             | 8 ++++----
 cpp/core/internal/mediums/bloom_filter.cc    | 2 +-
 cpp/core_v2/internal/mediums/bloom_filter.cc | 2 +-
 script/oss.py                                | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmake/CMakeLists-smhasher.txt b/cmake/CMakeLists-smhasher.txt
index 08761ae1..e55c5c0c 100644
--- a/cmake/CMakeLists-smhasher.txt
+++ b/cmake/CMakeLists-smhasher.txt
@@ -3,7 +3,7 @@ project(smhasher CXX)
 cmake_minimum_required(VERSION 3.13)
 
 add_library(smhasher_murmur3 STATIC
-  cpp/src/smhasher/MurmurHash3.cpp
+  cpp/src/smhasher/src/MurmurHash3.cpp
 )
 
 target_include_directories(smhasher_murmur3
diff --git a/cmake/local_setup_smhasher.cmake b/cmake/local_setup_smhasher.cmake
index cb4164dd..26cf9c18 100644
--- a/cmake/local_setup_smhasher.cmake
+++ b/cmake/local_setup_smhasher.cmake
@@ -2,16 +2,16 @@ set(PKG_STAGE_SRC_ROOT ${TOOLS_ROOT}/src/smhasher)
 if (NOT EXISTS ${PKG_STAGE_SRC_ROOT}/CMakeLists.txt)
   set(PKG_SRC_ROOT ${PROJECT_SOURCE_DIR}/third_party/smhasher)
   execute_process(
-    COMMAND mkdir -p ${PKG_STAGE_SRC_ROOT}/cpp/src/smhasher
+    COMMAND mkdir -p ${PKG_STAGE_SRC_ROOT}/cpp/src/smhasher/src
   )
   execute_process(
-    COMMAND mkdir -p ${PKG_STAGE_SRC_ROOT}/cpp/include/smhasher
+    COMMAND mkdir -p ${PKG_STAGE_SRC_ROOT}/cpp/include/smhasher/src
   )
   execute_process(
-    COMMAND cp ${PKG_SRC_ROOT}/src/MurmurHash3.cpp ${PKG_STAGE_SRC_ROOT}/cpp/src/smhasher
+    COMMAND cp ${PKG_SRC_ROOT}/src/MurmurHash3.cpp ${PKG_STAGE_SRC_ROOT}/cpp/src/smhasher/src
   )
   execute_process(
-    COMMAND cp ${PKG_SRC_ROOT}/src/MurmurHash3.h ${PKG_STAGE_SRC_ROOT}/cpp/include/smhasher
+    COMMAND cp ${PKG_SRC_ROOT}/src/MurmurHash3.h ${PKG_STAGE_SRC_ROOT}/cpp/include/smhasher/src
   )
   execute_process(
     COMMAND cp cmake/CMakeLists-smhasher.txt ${PKG_STAGE_SRC_ROOT}/CMakeLists.txt
diff --git a/cpp/core/internal/mediums/bloom_filter.cc b/cpp/core/internal/mediums/bloom_filter.cc
index 835ed205..8c05ca66 100644
--- a/cpp/core/internal/mediums/bloom_filter.cc
+++ b/cpp/core/internal/mediums/bloom_filter.cc
@@ -2,7 +2,7 @@
 
 #include "absl/numeric/int128.h"
 #include "absl/strings/numbers.h"
-#include "smhasher/MurmurHash3.h"
+#include "smhasher/src/MurmurHash3.h"
 
 namespace location {
 namespace nearby {
diff --git a/cpp/core_v2/internal/mediums/bloom_filter.cc b/cpp/core_v2/internal/mediums/bloom_filter.cc
index b2f08fc9..f4074347 100644
--- a/cpp/core_v2/internal/mediums/bloom_filter.cc
+++ b/cpp/core_v2/internal/mediums/bloom_filter.cc
@@ -2,7 +2,7 @@
 
 #include "absl/numeric/int128.h"
 #include "absl/strings/numbers.h"
-#include "smhasher/MurmurHash3.h"
+#include "smhasher/src/MurmurHash3.h"
 
 namespace location {
 namespace nearby {
diff --git a/script/oss.py b/script/oss.py
index 4b621b0f..1892d64e 100755
--- a/script/oss.py
+++ b/script/oss.py
@@ -135,6 +135,7 @@ def post_process_oss_files(path, args):
     ("location/nearby/connections/proto", "proto/connections"),
     ("_portable_proto.pb.h", ".pb.h"),
     (".proto.h", ".pb.h"),
+    ("smhasher/MurmurHash3.h", "smhasher/src/MurmurHash3.h"),
   )
 
   for root, dirs, files in os.walk(path):