PolicyManager: Use the full path for includes.
This patch drops the -I. option from CPPFLAGS added recently which
forces all the includes to use the full path such as
"update_engine/policy_manager/some_file.h" instead of
"policy_manager/some_file.h". This fixes a bug where scons didn't
detect changes on header files because the '.' directory isn't
listed on the CPPPATH environment variable. Instead of adding it
there, this patch removes it since that's more aligned with the
current codebase style.
BUG=None
TEST=Code builds.
Change-Id: I117f288e5b61c1ac3c953d3ec7a166395068da34
Reviewed-on: https://chromium-review.googlesource.com/185101
Tested-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
diff --git a/policy_manager/fake_random_provider.h b/policy_manager/fake_random_provider.h
index b2d85e3..10c6cb7 100644
--- a/policy_manager/fake_random_provider.h
+++ b/policy_manager/fake_random_provider.h
@@ -5,8 +5,8 @@
#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_POLICY_MANAGER_FAKE_RANDOM_PROVIDER_H
#define CHROMEOS_PLATFORM_UPDATE_ENGINE_POLICY_MANAGER_FAKE_RANDOM_PROVIDER_H
-#include "policy_manager/fake_variable.h"
-#include "policy_manager/random_provider.h"
+#include "update_engine/policy_manager/fake_variable.h"
+#include "update_engine/policy_manager/random_provider.h"
namespace chromeos_policy_manager {
diff --git a/policy_manager/fake_variable.h b/policy_manager/fake_variable.h
index 9d349b6..7410fdc 100644
--- a/policy_manager/fake_variable.h
+++ b/policy_manager/fake_variable.h
@@ -7,7 +7,7 @@
#include <base/memory/scoped_ptr.h>
-#include "policy_manager/variable.h"
+#include "update_engine/policy_manager/variable.h"
namespace chromeos_policy_manager {
diff --git a/policy_manager/generic_variables.h b/policy_manager/generic_variables.h
index 87ba066..050fca5 100644
--- a/policy_manager/generic_variables.h
+++ b/policy_manager/generic_variables.h
@@ -9,7 +9,7 @@
#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_POLICY_MANAGER_GENERIC_VARIABLES_H
#define CHROMEOS_PLATFORM_UPDATE_ENGINE_POLICY_MANAGER_GENERIC_VARIABLES_H
-#include "policy_manager/variable.h"
+#include "update_engine/policy_manager/variable.h"
namespace chromeos_policy_manager {
diff --git a/policy_manager/generic_variables_unittest.cc b/policy_manager/generic_variables_unittest.cc
index e14dc50..ea7da59 100644
--- a/policy_manager/generic_variables_unittest.cc
+++ b/policy_manager/generic_variables_unittest.cc
@@ -5,8 +5,8 @@
#include <base/memory/scoped_ptr.h>
#include <gtest/gtest.h>
-#include "policy_manager/generic_variables.h"
-#include "policy_manager/pmtest_utils.h"
+#include "update_engine/policy_manager/generic_variables.h"
+#include "update_engine/policy_manager/pmtest_utils.h"
using base::TimeDelta;
diff --git a/policy_manager/random_provider.h b/policy_manager/random_provider.h
index 60d7b2c..fcc4889 100644
--- a/policy_manager/random_provider.h
+++ b/policy_manager/random_provider.h
@@ -7,8 +7,8 @@
#include <base/memory/scoped_ptr.h>
-#include "policy_manager/provider.h"
-#include "policy_manager/variable.h"
+#include "update_engine/policy_manager/provider.h"
+#include "update_engine/policy_manager/variable.h"
namespace chromeos_policy_manager {
diff --git a/policy_manager/real_random_provider.cc b/policy_manager/real_random_provider.cc
index 28213fa..5cb0b55 100644
--- a/policy_manager/real_random_provider.cc
+++ b/policy_manager/real_random_provider.cc
@@ -9,8 +9,8 @@
#include <base/file_util.h>
#include <base/stringprintf.h>
-#include "policy_manager/real_random_provider.h"
-#include "policy_manager/variable.h"
+#include "update_engine/policy_manager/real_random_provider.h"
+#include "update_engine/policy_manager/variable.h"
using std::string;
diff --git a/policy_manager/real_random_provider.h b/policy_manager/real_random_provider.h
index e909d38..4ef59a3 100644
--- a/policy_manager/real_random_provider.h
+++ b/policy_manager/real_random_provider.h
@@ -5,7 +5,7 @@
#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_POLICY_MANAGER_REAL_RANDOM_PROVIDER_H
#define CHROMEOS_PLATFORM_UPDATE_ENGINE_POLICY_MANAGER_REAL_RANDOM_PROVIDER_H
-#include "policy_manager/random_provider.h"
+#include "update_engine/policy_manager/random_provider.h"
namespace chromeos_policy_manager {
diff --git a/policy_manager/real_random_provider_unittest.cc b/policy_manager/real_random_provider_unittest.cc
index f04ca7c..d5ac888 100644
--- a/policy_manager/real_random_provider_unittest.cc
+++ b/policy_manager/real_random_provider_unittest.cc
@@ -6,8 +6,8 @@
#include <base/time.h>
#include <gtest/gtest.h>
-#include "policy_manager/pmtest_utils.h"
-#include "policy_manager/real_random_provider.h"
+#include "update_engine/policy_manager/pmtest_utils.h"
+#include "update_engine/policy_manager/real_random_provider.h"
using base::TimeDelta;
diff --git a/policy_manager/variable_unittest.cc b/policy_manager/variable_unittest.cc
index f4aa084..8c7bdc5 100644
--- a/policy_manager/variable_unittest.cc
+++ b/policy_manager/variable_unittest.cc
@@ -4,7 +4,7 @@
#include <gtest/gtest.h>
-#include "policy_manager/variable.h"
+#include "update_engine/policy_manager/variable.h"
using std::string;