Add libpolicy stub-implementation to Android.mk

libpolicy is installed directly as "policy" in Chrome OS, so this patch
moves the chromeos/policy directory one level up to match what users will
see in installed Chrome OS include dir. A new libchromeos-policy shared
library is included in the Android.mk.

BUG: 23555535
TEST=emerge-link libchromeos; `mm` in aosp.

Change-Id: I0d62a1651632242a08309ca2c00056837a5280a6

17 files changed, 38 insertions, 11 deletions

diff --git a/Android.mk b/Android.mk
index a6b2347..b452df6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,6 +62,10 @@ libchromeos_http_sources := \
     chromeos/http/http_transport_curl.cc \
     chromeos/http/http_utils.cc
 
+libchromeos_policy_sources := \
+    policy/device_policy.cc \
+    policy/libpolicy.cc
+
 libchromeos_stream_sources := \
     chromeos/streams/file_stream.cc \
     chromeos/streams/input_stream_set.cc \
@@ -198,6 +202,21 @@ LOCAL_CLANG := true
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_SHARED_LIBRARY)
 
+# Shared policy library for target
+# ========================================================
+include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := $(libchromeos_cpp_extension)
+LOCAL_MODULE := libchromeos-policy
+LOCAL_SRC_FILES := $(libchromeos_policy_sources)
+LOCAL_C_INCLUDES := $(libchromeos_includes)
+LOCAL_SHARED_LIBRARIES := $(libchromeos_shared_libraries)
+LOCAL_CFLAGS := $(libchromeos_CFLAGS)
+LOCAL_CPPFLAGS := $(libchromeos_CPPFLAGS)
+LOCAL_RTTI_FLAG := -frtti
+LOCAL_CLANG := true
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+include $(BUILD_SHARED_LIBRARY)
+
 # Static library for target
 # ========================================================
 include $(CLEAR_VARS)
diff --git a/libchromeos.gypi b/libchromeos.gypi
index a2ff98f..5dd5255 100644
--- a/libchromeos.gypi
+++ b/libchromeos.gypi
@@ -227,9 +227,9 @@
         '-Wl,--version-script,<(platform2_root)/libchromeos/libpolicy.ver',
       ],
       'sources': [
-        'chromeos/policy/device_policy.cc',
-        'chromeos/policy/device_policy_impl.cc',
-        'chromeos/policy/libpolicy.cc',
+        'policy/device_policy.cc',
+        'policy/device_policy_impl.cc',
+        'policy/libpolicy.cc',
       ],
     },
     {
@@ -359,7 +359,7 @@
           'dependencies': ['libpolicy-<(libbase_ver)'],
           'includes': ['../common-mk/common_test.gypi'],
           'sources': [
-            'chromeos/policy/tests/libpolicy_unittest.cc',
+            'policy/tests/libpolicy_unittest.cc',
           ]
         },
       ],
diff --git a/libpolicy.gypi b/libpolicy.gypi
index b22d690..25b251d 100644
--- a/libpolicy.gypi
+++ b/libpolicy.gypi
@@ -7,11 +7,11 @@
         {
           'destination': '<(SHARED_INTERMEDIATE_DIR)/include/policy',
           'files': [
-            'chromeos/policy/device_policy.h',
-            'chromeos/policy/device_policy_impl.h',
-            'chromeos/policy/libpolicy.h',
-            'chromeos/policy/mock_libpolicy.h',
-            'chromeos/policy/mock_device_policy.h',
+            'policy/device_policy.h',
+            'policy/device_policy_impl.h',
+            'policy/libpolicy.h',
+            'policy/mock_libpolicy.h',
+            'policy/mock_device_policy.h',
           ],
         },
       ],
diff --git a/chromeos/policy/WATCHLISTS b/policy/WATCHLISTS
index c806539..c806539 100644
--- a/chromeos/policy/WATCHLISTS
+++ b/policy/WATCHLISTS
diff --git a/chromeos/policy/device_policy.cc b/policy/device_policy.cc
index e9445e7..e9445e7 100644
--- a/chromeos/policy/device_policy.cc
+++ b/policy/device_policy.cc
diff --git a/chromeos/policy/device_policy.h b/policy/device_policy.h
index 38bdbc3..38bdbc3 100644
--- a/chromeos/policy/device_policy.h
+++ b/policy/device_policy.h
diff --git a/chromeos/policy/device_policy_impl.cc b/policy/device_policy_impl.cc
index cef2129..7d9bc60 100644
--- a/chromeos/policy/device_policy_impl.cc
+++ b/policy/device_policy_impl.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 "chromeos/policy/device_policy_impl.h"
+#include "policy/device_policy_impl.h"
 
 #include <base/files/file_util.h>
 #include <base/logging.h>
diff --git a/chromeos/policy/device_policy_impl.h b/policy/device_policy_impl.h
index 484e78d..484e78d 100644
--- a/chromeos/policy/device_policy_impl.h
+++ b/policy/device_policy_impl.h
diff --git a/chromeos/policy/libpolicy.cc b/policy/libpolicy.cc
index 2e2c621..c075c84 100644
--- a/chromeos/policy/libpolicy.cc
+++ b/policy/libpolicy.cc
@@ -6,13 +6,19 @@
 
 #include <base/logging.h>
 
+#include "policy/device_policy.h"
+#ifndef __ANDROID__
 #include "policy/device_policy_impl.h"
+#endif
 
 namespace policy {
 
 PolicyProvider::PolicyProvider()
-    : device_policy_(new DevicePolicyImpl),
+    : device_policy_(nullptr),
       device_policy_is_loaded_(false) {
+#ifndef __ANDROID__
+  device_policy_.reset(new DevicePolicyImpl());
+#endif
 }
 
 PolicyProvider::PolicyProvider(DevicePolicy* device_policy)
@@ -24,6 +30,8 @@ PolicyProvider::~PolicyProvider() {
 }
 
 bool PolicyProvider::Reload() {
+  if (!device_policy_)
+    return false;
   device_policy_is_loaded_ = device_policy_->LoadPolicy();
   if (!device_policy_is_loaded_) {
     LOG(WARNING) << "Could not load the device policy file.";
diff --git a/chromeos/policy/libpolicy.h b/policy/libpolicy.h
index f05a37e..f05a37e 100644
--- a/chromeos/policy/libpolicy.h
+++ b/policy/libpolicy.h
diff --git a/chromeos/policy/mock_device_policy.h b/policy/mock_device_policy.h
index 0960664..0960664 100644
--- a/chromeos/policy/mock_device_policy.h
+++ b/policy/mock_device_policy.h
diff --git a/chromeos/policy/mock_libpolicy.h b/policy/mock_libpolicy.h
index c4315ea..c4315ea 100644
--- a/chromeos/policy/mock_libpolicy.h
+++ b/policy/mock_libpolicy.h
diff --git a/chromeos/policy/tests/libpolicy_unittest.cc b/policy/tests/libpolicy_unittest.cc
index 3676fd5..3676fd5 100644
--- a/chromeos/policy/tests/libpolicy_unittest.cc
+++ b/policy/tests/libpolicy_unittest.cc
diff --git a/chromeos/policy/tests/whitelist/README b/policy/tests/whitelist/README
index 34d63d0..34d63d0 100644
--- a/chromeos/policy/tests/whitelist/README
+++ b/policy/tests/whitelist/README
diff --git a/chromeos/policy/tests/whitelist/owner.key b/policy/tests/whitelist/owner.key
index 352c42c..352c42c 100644
--- a/chromeos/policy/tests/whitelist/owner.key
+++ b/policy/tests/whitelist/owner.key
diff --git a/chromeos/policy/tests/whitelist/policy_all b/policy/tests/whitelist/policy_all
index cde2732..cde2732 100644
--- a/chromeos/policy/tests/whitelist/policy_all
+++ b/policy/tests/whitelist/policy_all
diff --git a/chromeos/policy/tests/whitelist/policy_none b/policy/tests/whitelist/policy_none
index 5d1cf1f..5d1cf1f 100644
--- a/chromeos/policy/tests/whitelist/policy_none
+++ b/policy/tests/whitelist/policy_none