From 85fffbdcfa172bb7ea7731875eeeae6ce1c01885 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Sun, 19 Sep 2021 19:27:12 +0200
Subject: [PATCH] livedisplay: Expose headers and implementations as Soong
 modules

Change-Id: I335cb98b544fceed1e0d11f0a7dd9cc38860b5aa
---
 hidl/livedisplay/Android.bp                        | 14 +++++++++++++-
 hidl/livedisplay/SunlightEnhancement.cpp           |  2 +-
 .../livedisplay/oplus}/SunlightEnhancement.h       |  0
 hidl/livedisplay/service.cpp                       |  3 +--
 4 files changed, 15 insertions(+), 4 deletions(-)
 rename hidl/livedisplay/{ => include/livedisplay/oplus}/SunlightEnhancement.h (100%)

diff --git a/hidl/livedisplay/Android.bp b/hidl/livedisplay/Android.bp
index 00fe3bb..5995d47 100644
--- a/hidl/livedisplay/Android.bp
+++ b/hidl/livedisplay/Android.bp
@@ -12,6 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+filegroup {
+    name: "vendor.lineage.livedisplay@2.1-oplus-se",
+    srcs: ["SunlightEnhancement.cpp"],
+}
+
+cc_library_headers {
+    name: "vendor.lineage.livedisplay@2.1-oplus-headers",
+    vendor_available: true,
+    export_include_dirs: ["include"],
+}
+
 cc_binary {
     name: "vendor.lineage.livedisplay@2.1-service.oplus",
     defaults: ["hidl_defaults"],
@@ -21,7 +32,7 @@ cc_binary {
     srcs: [
         ":vendor.lineage.livedisplay@2.0-sdm-pa",
         ":vendor.lineage.livedisplay@2.0-sdm-utils",
-        "SunlightEnhancement.cpp",
+        ":vendor.lineage.livedisplay@2.1-oplus-se",
         "service.cpp",
     ],
     shared_libs: [
@@ -34,6 +45,7 @@ cc_binary {
     ],
     header_libs: [
         "vendor.lineage.livedisplay@2.0-sdm-headers",
+        "vendor.lineage.livedisplay@2.1-oplus-headers",
     ],
     proprietary: true,
 }
diff --git a/hidl/livedisplay/SunlightEnhancement.cpp b/hidl/livedisplay/SunlightEnhancement.cpp
index c5e98ff..5c7dafc 100644
--- a/hidl/livedisplay/SunlightEnhancement.cpp
+++ b/hidl/livedisplay/SunlightEnhancement.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "SunlightEnhancement.h"
+#include <livedisplay/oplus/SunlightEnhancement.h>
 #include <android-base/file.h>
 #include <android-base/strings.h>
 
diff --git a/hidl/livedisplay/SunlightEnhancement.h b/hidl/livedisplay/include/livedisplay/oplus/SunlightEnhancement.h
similarity index 100%
rename from hidl/livedisplay/SunlightEnhancement.h
rename to hidl/livedisplay/include/livedisplay/oplus/SunlightEnhancement.h
diff --git a/hidl/livedisplay/service.cpp b/hidl/livedisplay/service.cpp
index 711fcdb..b218cc1 100644
--- a/hidl/livedisplay/service.cpp
+++ b/hidl/livedisplay/service.cpp
@@ -19,11 +19,10 @@
 #include <android-base/logging.h>
 #include <binder/ProcessState.h>
 #include <hidl/HidlTransportSupport.h>
+#include <livedisplay/oplus/SunlightEnhancement.h>
 #include <livedisplay/sdm/PictureAdjustment.h>
 #include <vendor/lineage/livedisplay/2.1/IPictureAdjustment.h>
 
-#include "SunlightEnhancement.h"
-
 using ::android::OK;
 using ::android::sp;
 using ::android::status_t;