commit f1d670fb9ee5281060a7d7d56d09dd53114bc72f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 08 07:26:37 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 08 07:26:37 2022 +0000
tree e7ac1947bd607fb73fe05ea8eca730a052882436
parent 868e1c0b1bf79fdde092a0ef4b40f97a85b3f5ee
parent 641a24c3f6126f79e7d664459a6162209a21a9f1

Merge "Added export_include_dirs in libfakeservicemanager" am: 3a44d98d8e am: 6eff440147 am: 99d32a97e3 am: a9dab72760 am: 641a24c3f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2208956

Change-Id: I32fc6b7efd9809185c7f64df9505fce0a6ea1262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/fakeservicemanager/Android.bp

diff --git a/libs/fakeservicemanager/Android.bp b/libs/fakeservicemanager/Android.bp
index 47c0657..29924ff 100644
--- a/libs/fakeservicemanager/Android.bp
+++ b/libs/fakeservicemanager/Android.bp
@@ -28,6 +28,7 @@
 cc_library {
     name: "libfakeservicemanager",
     defaults: ["fakeservicemanager_defaults"],
+    export_include_dirs: ["include/fakeservicemanager"],
 }
 
 cc_test_host {
@@ -37,4 +38,5 @@
         "test_sm.cpp",
     ],
     static_libs: ["libgmock"],
+    local_include_dirs: ["include/fakeservicemanager"],
 }

libs/fakeservicemanager/include/fakeservicemanager/ServiceManager.h

diff --git a/libs/fakeservicemanager/ServiceManager.h b/libs/fakeservicemanager/include/fakeservicemanager/ServiceManager.h
similarity index 100%
rename from libs/fakeservicemanager/ServiceManager.h
rename to libs/fakeservicemanager/include/fakeservicemanager/ServiceManager.h