Merge "Expose FileStream/MemoryStream for consumption" am: 8c8d726548 am: 1544784751

Original change: https://android-review.googlesource.com/c/platform/external/puffin/+/1916909

Change-Id: I13de923dbc86a6b2b3186d9725ba75305f4c8a7b

16 files changed, 19 insertions, 19 deletions

diff --git a/src/brotli_util.cc b/src/brotli_util.cc
index 587a844..2de5578 100644
--- a/src/brotli_util.cc
+++ b/src/brotli_util.cc
@@ -7,7 +7,7 @@
 #include "brotli/decode.h"
 #include "brotli/encode.h"
 #include "puffin/src/logging.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 
 namespace puffin {
 
diff --git a/src/brotli_util_unittest.cc b/src/brotli_util_unittest.cc
index 3f4685a..4ce8763 100644
--- a/src/brotli_util_unittest.cc
+++ b/src/brotli_util_unittest.cc
@@ -5,7 +5,7 @@
 #include "gtest/gtest.h"
 
 #include "puffin/src/include/puffin/brotli_util.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puffin_stream.h"
 
 namespace puffin {
diff --git a/src/file_stream.cc b/src/file_stream.cc
index 0abde31..de03723 100644
--- a/src/file_stream.cc
+++ b/src/file_stream.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "puffin/src/file_stream.h"
+#include "puffin/file_stream.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/fuzzer_puffpatch.cc b/src/fuzzer_puffpatch.cc
index 28ee5bc..a27c3b9 100644
--- a/src/fuzzer_puffpatch.cc
+++ b/src/fuzzer_puffpatch.cc
@@ -9,7 +9,7 @@
 
 #include "puffin/src/include/puffin/common.h"
 #include "puffin/src/include/puffin/puffpatch.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 
 using puffin::BitExtent;
 using puffin::Buffer;
diff --git a/src/file_stream.h b/src/include/puffin/file_stream.h
index 626d7c6..626d7c6 100644
--- a/src/file_stream.h
+++ b/src/include/puffin/file_stream.h
diff --git a/src/memory_stream.h b/src/include/puffin/memory_stream.h
index a338e7f..a338e7f 100644
--- a/src/memory_stream.h
+++ b/src/include/puffin/memory_stream.h
diff --git a/src/integration_test.cc b/src/integration_test.cc
index d7cc59c..9e03768 100644
--- a/src/integration_test.cc
+++ b/src/integration_test.cc
@@ -10,7 +10,7 @@
 #include "puffin/src/include/puffin/puffdiff.h"
 #include "puffin/src/include/puffin/puffpatch.h"
 #include "puffin/src/include/puffin/utils.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puffin_stream.h"
 #include "puffin/src/unittest_common.h"
 
diff --git a/src/main.cc b/src/main.cc
index 5a5cc9b..0c1bdf8 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -13,8 +13,8 @@
 #include "gflags/gflags.h"
 #endif
 
+#include "puffin/file_stream.h"
 #include "puffin/src/extent_stream.h"
-#include "puffin/src/file_stream.h"
 #include "puffin/src/include/puffin/common.h"
 #include "puffin/src/include/puffin/huffer.h"
 #include "puffin/src/include/puffin/puffdiff.h"
@@ -22,7 +22,7 @@
 #include "puffin/src/include/puffin/puffpatch.h"
 #include "puffin/src/include/puffin/utils.h"
 #include "puffin/src/logging.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puffin_stream.h"
 
 using puffin::BitExtent;
diff --git a/src/memory_stream.cc b/src/memory_stream.cc
index 706f4a3..8a2afdd 100644
--- a/src/memory_stream.cc
+++ b/src/memory_stream.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/patching_unittest.cc b/src/patching_unittest.cc
index 134f137..fec2ecc 100644
--- a/src/patching_unittest.cc
+++ b/src/patching_unittest.cc
@@ -12,7 +12,7 @@
 #include "puffin/src/include/puffin/puffpatch.h"
 #include "puffin/src/include/puffin/utils.h"
 #include "puffin/src/logging.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puffin_stream.h"
 #include "puffin/src/unittest_common.h"
 
diff --git a/src/puffdiff.cc b/src/puffdiff.cc
index 7f7d9ce..2588379 100644
--- a/src/puffdiff.cc
+++ b/src/puffdiff.cc
@@ -17,14 +17,14 @@
 #include "zucchini/patch_writer.h"
 #include "zucchini/zucchini.h"
 
-#include "puffin/src/file_stream.h"
+#include "puffin/file_stream.h"
 #include "puffin/src/include/puffin/brotli_util.h"
 #include "puffin/src/include/puffin/common.h"
 #include "puffin/src/include/puffin/puffer.h"
 #include "puffin/src/include/puffin/puffpatch.h"
 #include "puffin/src/include/puffin/utils.h"
 #include "puffin/src/logging.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puffin.pb.h"
 #include "puffin/src/puffin_stream.h"
 
diff --git a/src/puffin_unittest.cc b/src/puffin_unittest.cc
index 0279813..3ac0173 100644
--- a/src/puffin_unittest.cc
+++ b/src/puffin_unittest.cc
@@ -15,7 +15,7 @@
 #include "puffin/src/include/puffin/puffer.h"
 #include "puffin/src/include/puffin/utils.h"
 #include "puffin/src/logging.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puff_reader.h"
 #include "puffin/src/puff_writer.h"
 #include "puffin/src/puffin_stream.h"
diff --git a/src/puffpatch.cc b/src/puffpatch.cc
index 3802b17..e9e4a32 100644
--- a/src/puffpatch.cc
+++ b/src/puffpatch.cc
@@ -23,7 +23,7 @@
 #include "puffin/src/include/puffin/puffer.h"
 #include "puffin/src/include/puffin/stream.h"
 #include "puffin/src/logging.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puffin.pb.h"
 #include "puffin/src/puffin_stream.h"
 
diff --git a/src/stream_unittest.cc b/src/stream_unittest.cc
index 5c1f984..ef3503d 100644
--- a/src/stream_unittest.cc
+++ b/src/stream_unittest.cc
@@ -6,11 +6,11 @@
 
 #include "gtest/gtest.h"
 
+#include "puffin/file_stream.h"
 #include "puffin/src/extent_stream.h"
-#include "puffin/src/file_stream.h"
 #include "puffin/src/include/puffin/huffer.h"
 #include "puffin/src/include/puffin/puffer.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puffin_stream.h"
 #include "puffin/src/unittest_common.h"
 
diff --git a/src/utils.cc b/src/utils.cc
index b9b06c1..b2666d3 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -12,12 +12,12 @@
 #include <string>
 #include <vector>
 
+#include "puffin/file_stream.h"
 #include "puffin/src/bit_reader.h"
-#include "puffin/src/file_stream.h"
 #include "puffin/src/include/puffin/common.h"
 #include "puffin/src/include/puffin/puffer.h"
 #include "puffin/src/logging.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/puff_writer.h"
 
 using std::set;
diff --git a/src/utils_unittest.cc b/src/utils_unittest.cc
index bbeecbf..7876c53 100644
--- a/src/utils_unittest.cc
+++ b/src/utils_unittest.cc
@@ -8,10 +8,10 @@
 
 #include "gtest/gtest.h"
 
-#include "puffin/src/file_stream.h"
+#include "puffin/file_stream.h"
 #include "puffin/src/include/puffin/common.h"
 #include "puffin/src/include/puffin/utils.h"
-#include "puffin/src/memory_stream.h"
+#include "puffin/memory_stream.h"
 #include "puffin/src/unittest_common.h"
 
 using std::string;