diff options
| author | 2022-02-02 14:09:24 -0800 | |
|---|---|---|
| committer | 2022-03-03 23:20:05 +0000 | |
| commit | 317c3f076d0940fc85c0a17ce830c4ff698e0124 (patch) | |
| tree | 066a2aeed668123f807fd820efc61831fea7f230 | |
| parent | 27dbab9bc78fdae8b43d25609553bde16f07fd4a (diff) | |
export libtonemap headers
libtonemap could be overridden by the vendor counterpart. The
headers should come from framework.
Bug: 200310159
Change-Id: I2685903543aac8c2d02fee2deba2c40dbb2f287c
| -rw-r--r-- | libs/renderengine/Android.bp | 3 | ||||
| -rw-r--r-- | libs/renderengine/tests/Android.bp | 3 | ||||
| -rw-r--r-- | libs/shaders/Android.bp | 4 | ||||
| -rw-r--r-- | libs/tonemap/Android.bp | 7 | ||||
| -rw-r--r-- | libs/tonemap/tests/Android.bp | 3 |
5 files changed, 19 insertions, 1 deletions
diff --git a/libs/renderengine/Android.bp b/libs/renderengine/Android.bp index 07c5dd8a82..84e84dddad 100644 --- a/libs/renderengine/Android.bp +++ b/libs/renderengine/Android.bp @@ -122,6 +122,9 @@ cc_library_static { ":librenderengine_threaded_sources", ":librenderengine_skia_sources", ], + header_libs: [ + "libtonemap_headers", + ], include_dirs: [ "external/skia/src/gpu", ], diff --git a/libs/renderengine/tests/Android.bp b/libs/renderengine/tests/Android.bp index a426850350..d91af1ea85 100644 --- a/libs/renderengine/tests/Android.bp +++ b/libs/renderengine/tests/Android.bp @@ -42,6 +42,9 @@ cc_test { "libshaders", "libtonemap", ], + header_libs: [ + "libtonemap_headers", + ], shared_libs: [ "libbase", diff --git a/libs/shaders/Android.bp b/libs/shaders/Android.bp index 390b22821e..1cd143e98d 100644 --- a/libs/shaders/Android.bp +++ b/libs/shaders/Android.bp @@ -38,6 +38,10 @@ cc_library_static { "libui-types", ], + header_libs: [ + "libtonemap_headers", + ], + srcs: [ "shaders.cpp", ], diff --git a/libs/tonemap/Android.bp b/libs/tonemap/Android.bp index 5360fe2b07..99d1b22717 100644 --- a/libs/tonemap/Android.bp +++ b/libs/tonemap/Android.bp @@ -25,7 +25,6 @@ cc_library_static { name: "libtonemap", vendor_available: true, - export_include_dirs: ["include"], local_include_dirs: ["include"], shared_libs: [ @@ -41,3 +40,9 @@ cc_library_static { "tonemap.cpp", ], } + +cc_library_headers { + name: "libtonemap_headers", + vendor_available: true, + export_include_dirs: ["include"], +} diff --git a/libs/tonemap/tests/Android.bp b/libs/tonemap/tests/Android.bp index f46f3fa27d..d519482fe3 100644 --- a/libs/tonemap/tests/Android.bp +++ b/libs/tonemap/tests/Android.bp @@ -27,6 +27,9 @@ cc_test { srcs: [ "tonemap_test.cpp", ], + header_libs: [ + "libtonemap_headers", + ], shared_libs: [ "android.hardware.graphics.common-V3-ndk", ], |