Merge "Add the "bsdiff/" prefix to all include paths." am: b63fef9a33 am: 392beaef11

am: 5f4657903a

Change-Id: If0da2f20786c8fc2f6a0a6c103bd0631f4ead4e8

Android.bp

@@ -16,6 +16,9 @@ cc_defaults {
     name: "bsdiff_defaults",
     host_supported: true,
     static_libs: ["libbz"],
+    // Allow internal includes to be referenced with the "bsdiff/" prefix in the
+    // path.
+    include_dirs: ["external"],
     export_include_dirs: [
         "include",
         // TODO(deymo): Remove include/bsdiff when all callers use the "bsdiff/"

Makefile

@@ -9,7 +9,7 @@ LIBRARIES-$(USE_BSDIFF) += libbsdiff.so
 BINARIES := $(EXECUTABLES-y) $(LIBRARIES-y)
 
 INSTALL = install
-CPPFLAGS += -Iinclude
+CPPFLAGS += -Iinclude -I..
 CXXFLAGS += -std=c++11 -O3 -Wall -Werror -fPIC
 
 DESTDIR ?=

bsdiff.cc

@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c,v 1.1 2005/08/06 01:59:05
 
 #include <algorithm>
 
-#include "patch_writer.h"
+#include "bsdiff/patch_writer.h"
 
 namespace bsdiff {
 

bsdiff.gyp

@@ -21,7 +21,12 @@
     'cflags_cc': [
       '-Wnon-virtual-dtor',
     ],
-    'include_dirs': ['include'],
+    'include_dirs': [
+      'include',
+      # We need this include dir because we include all the local code as
+      # "bsdiff/...".
+      '<(platform2_root)/../aosp/external',
+    ],
   },
   'variables': {
     'bspatch_sources': [

bsdiff_unittest.cc

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "test_utils.h"
+#include "bsdiff/test_utils.h"
 
 using std::string;
 using std::vector;

bspatch.cc

@@ -36,22 +36,22 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 #include <algorithm>
-#include <memory>
 #include <limits>
+#include <memory>
 #include <vector>
 
+#include "bsdiff/buffer_file.h"
+#include "bsdiff/extents.h"
 #include "bsdiff/extents_file.h"
+#include "bsdiff/file.h"
 #include "bsdiff/file_interface.h"
-#include "buffer_file.h"
-#include "extents.h"
-#include "file.h"
-#include "memory_file.h"
-#include "sink_file.h"
+#include "bsdiff/memory_file.h"
+#include "bsdiff/sink_file.h"
 
 namespace {
 

bspatch_unittest.cc

@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 
-#include "test_utils.h"
+#include "bsdiff/test_utils.h"
 
 namespace bsdiff {
 

buffer_file.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 "buffer_file.h"
+#include "bsdiff/buffer_file.h"
 
 #include "bsdiff/bspatch.h"
 

bz2_compressor.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "bz2_compressor.h"
+#include "bsdiff/bz2_compressor.h"
 
 #include <string.h>
 
-#include "logging.h"
+#include "bsdiff/logging.h"
 
 using std::endl;
 

extents.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 "extents.h"
+#include "bsdiff/extents.h"
 
 #include <assert.h>
 #include <errno.h>

extents_file_unittest.cc

@@ -4,19 +4,18 @@
 
 #include "bsdiff/extents_file.h"
 
-#include <gtest/gtest.h>
 #include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include <string>
 #include <vector>
 
 #include "bsdiff/file_interface.h"
 
-using std::string;
 using std::vector;
 using testing::AnyNumber;
-using testing::StrictMock;
-using testing::Return;
 using testing::InSequence;
+using testing::Return;
+using testing::StrictMock;
 using testing::_;
 
 namespace bsdiff {

extents_unittest.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 "extents.h"
+#include "bsdiff/extents.h"
 
 #include <gtest/gtest.h>
 #include <vector>

file.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 "file.h"
+#include "bsdiff/file.h"
 
 #include <errno.h>
 #include <fcntl.h>

memory_file.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 "memory_file.h"
+#include "bsdiff/memory_file.h"
 
 #include <algorithm>
 #include <string.h>

patch_writer.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "patch_writer.h"
+#include "bsdiff/patch_writer.h"
 
 #include <string.h>
 
-#include "logging.h"
+#include "bsdiff/logging.h"
 
 using std::endl;
 

sink_file.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 "sink_file.h"
+#include "bsdiff/sink_file.h"
 
 namespace bsdiff {
 

test_utils.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 "test_utils.h"
+#include "bsdiff/test_utils.h"
 
 #include <stdio.h>
 #include <stdlib.h>

testrunner.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 "test_utils.h"
+#include "bsdiff/test_utils.h"
 
 #include <gtest/gtest.h>