commit 3c8d4abaa4b4798a7dbc49f5317c76b1b6332ab0
author Alex Deymo <deymo@google.com> Wed Sep 02 17:15:00 2015 -0700
committer Alex Deymo <deymo@google.com> Wed Sep 02 17:31:18 2015 -0700
tree efe608af3e22bec10a4ade9fe93a541856c5f3d6
parent 238da575cbad80fb7ffb0e89b9ccb33c7889a0ba

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

libpolicy.gypi

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',
           ],
         },
       ],