diff options
| author | 2022-09-08 05:16:43 +0000 | |
|---|---|---|
| committer | 2022-09-08 05:16:43 +0000 | |
| commit | 6eff440147ece16cba0e2ae6ac67e31a5ef6737a (patch) | |
| tree | f3e69b6db1e31bc36389d311493c5bc29e8ae951 | |
| parent | 7ba24769979837de247585f06ed6a00c168d07dc (diff) | |
| parent | 3a44d98d8e887307256ef894c425248620698ba9 (diff) | |
Merge "Added export_include_dirs in libfakeservicemanager" am: 3a44d98d8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2208956
Change-Id: I4804215b4d6daed0c8df629ac91663c15f64caae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/fakeservicemanager/Android.bp | 2 | ||||
| -rw-r--r-- | libs/fakeservicemanager/include/fakeservicemanager/ServiceManager.h (renamed from libs/fakeservicemanager/ServiceManager.h) | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libs/fakeservicemanager/Android.bp b/libs/fakeservicemanager/Android.bp index 47c0657bbd..29924ff500 100644 --- a/libs/fakeservicemanager/Android.bp +++ b/libs/fakeservicemanager/Android.bp @@ -28,6 +28,7 @@ cc_defaults { cc_library { name: "libfakeservicemanager", defaults: ["fakeservicemanager_defaults"], + export_include_dirs: ["include/fakeservicemanager"], } cc_test_host { @@ -37,4 +38,5 @@ cc_test_host { "test_sm.cpp", ], static_libs: ["libgmock"], + local_include_dirs: ["include/fakeservicemanager"], } diff --git a/libs/fakeservicemanager/ServiceManager.h b/libs/fakeservicemanager/include/fakeservicemanager/ServiceManager.h index e0af5d4ba8..e0af5d4ba8 100644 --- a/libs/fakeservicemanager/ServiceManager.h +++ b/libs/fakeservicemanager/include/fakeservicemanager/ServiceManager.h |