diff options
| author | Roman Stratiienko <r.stratiienko@gmail.com> | 2022-11-16 15:16:39 +0200 |
|---|---|---|
| committer | Roman Stratiienko <r.stratiienko@gmail.com> | 2022-11-16 16:51:06 +0200 |
| commit | 4dfa62d8257bdd3f0568373bbb77f6d99ae94baa (patch) | |
| tree | e76bd9f9a7d9c3c4ccad0df98dd2a6b19c107680 | |
| parent | a7913de518c8bdc1998deef38438f1354fa00c92 (diff) | |
| download | drm_hwcomposer-4dfa62d8257bdd3f0568373bbb77f6d99ae94baa.tar.gz | |
drm_hwcomposer: Use header library instead of hardcoded path
This allows to put drm_hwcomposer in any directory.
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
| -rw-r--r-- | Android.bp | 11 | ||||
| -rw-r--r-- | tests/Android.bp | 14 |
2 files changed, 16 insertions, 9 deletions
@@ -12,6 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +cc_library_headers { + name: "drm_hwcomposer_headers", + vendor: true, + export_include_dirs: ["."], +} + // ===================== // libdrmhwc_utils.a // ===================== @@ -20,7 +26,7 @@ cc_library_static { srcs: ["utils/Worker.cpp"], - include_dirs: ["external/drm_hwcomposer"], + header_libs: ["drm_hwcomposer_headers"], cflags: [ "-Wall", @@ -48,9 +54,8 @@ cc_defaults { "libutils", ], - include_dirs: ["external/drm_hwcomposer"], - static_libs: ["libdrmhwc_utils"], + header_libs: ["drm_hwcomposer_headers"], cflags: [ "-Wall", diff --git a/tests/Android.bp b/tests/Android.bp index c48c86a..e3dc13b 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -25,10 +25,12 @@ cc_test { srcs: ["worker_test.cpp"], vendor: true, - header_libs: ["libhardware_headers"], + header_libs: [ + "drm_hwcomposer_headers", + "libhardware_headers", + ], static_libs: ["libdrmhwc_utils"], shared_libs: ["hwcomposer.drm"], - include_dirs: ["external/drm_hwcomposer"], } // Tool for listening and dumping uevents @@ -38,9 +40,9 @@ cc_test { srcs: ["uevent_print.cpp"], vendor: true, - header_libs: ["libhardware_headers"], - shared_libs: ["liblog"], - include_dirs: [ - "external/drm_hwcomposer", + header_libs: [ + "drm_hwcomposer_headers", + "libhardware_headers", ], + shared_libs: ["liblog"], } |