samsung: Make HAL header paths configurable through soong

$(call soong_config_set,samsungVars,target_specific_header_path,$(DEVICE_PATH)/include)

Change-Id: Ibdfd255efafd471e59dfec0860ace40c21a6e27f

Android.bp

@@ -4,3 +4,20 @@ soong_namespace {
         "hardware/google/interfaces",
     ],
 }
+
+soong_config_module_type {
+    name: "samsung_header_path",
+    module_type: "cc_defaults",
+    config_namespace: "samsungVars",
+    value_variables: ["target_specific_header_path"],
+    properties: ["include_dirs"],
+}
+
+samsung_header_path {
+    name: "samsung_header_path_defaults",
+    soong_config_variables: {
+        target_specific_header_path: {
+            include_dirs: ["%s"],
+        },
+    },
+}

aidl/light/Android.bp

@@ -1,15 +1,15 @@
 //
-// Copyright (C) 2021 The LineageOS Project
+// Copyright (C) 2021-2024 The LineageOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 
 cc_binary {
     name: "android.hardware.light-service.samsung",
+    defaults: ["samsung_header_path_defaults"],
     relative_install_path: "hw",
     init_rc: ["android.hardware.light-service.samsung.rc"],
     vintf_fragments: ["android.hardware.light-service.samsung.xml"],
-    local_include_dirs: ["include"],
     srcs: [
         "Lights.cpp",
         "service.cpp",

aidl/light/Lights.h

@@ -7,8 +7,9 @@
 #pragma once
 
 #include <aidl/android/hardware/light/BnLights.h>
+#include <samsung_lights.h>
+
 #include <unordered_map>
-#include "samsung_lights.h"
 
 using ::aidl::android::hardware::light::HwLightState;
 using ::aidl::android::hardware::light::HwLight;

hidl/consumerir/Android.bp

@@ -16,9 +16,9 @@
 
 cc_binary {
     name: "android.hardware.ir@1.0-service.samsung",
+    defaults: ["samsung_header_path_defaults"],
     relative_install_path: "hw",
     init_rc: ["android.hardware.ir@1.0-service.samsung.rc"],
-    local_include_dirs: ["include"],
     srcs: [
         "ConsumerIr.cpp",
         "service.cpp",

hidl/fastcharge/Android.bp

@@ -16,10 +16,10 @@
 
 cc_binary {
     name: "vendor.lineage.fastcharge@1.0-service.samsung",
+    defaults: ["samsung_header_path_defaults"],
     relative_install_path: "hw",
     init_rc: ["vendor.lineage.fastcharge@1.0-service.samsung.rc"],
     vintf_fragments: ["vendor.lineage.fastcharge@1.0-service.samsung.xml"],
-    local_include_dirs: ["include"],
     srcs: [
         "FastCharge.cpp",
         "service.cpp",

hidl/fastcharge/FastCharge.cpp

@@ -19,10 +19,10 @@
 #include "FastCharge.h"
 #include <android-base/logging.h>
 #include <cutils/properties.h>
+#include <samsung_fastcharge.h>
 
 #include <fstream>
 #include <iostream>
-#include "samsung_fastcharge.h"
 
 namespace vendor {
 namespace lineage {

hidl/powershare/Android.bp

@@ -16,10 +16,10 @@
 
 cc_binary {
     name: "vendor.lineage.powershare@1.0-service.samsung",
+    defaults: ["samsung_header_path_defaults"],
     relative_install_path: "hw",
     init_rc: ["vendor.lineage.powershare@1.0-service.samsung.rc"],
     vintf_fragments: ["vendor.lineage.powershare@1.0-service.samsung.xml"],
-    local_include_dirs: ["include"],
     srcs: [
         "PowerShare.cpp",
         "service.cpp",

hidl/powershare/PowerShare.cpp

@@ -18,9 +18,10 @@
 
 #include "PowerShare.h"
 #include <android-base/logging.h>
+#include <samsung_powershare.h>
+
 #include <fstream>
 #include <iostream>
-#include "samsung_powershare.h"
 
 namespace vendor {
 namespace lineage {

hidl/touch/Android.bp

@@ -1,4 +1,4 @@
-// Copyright (C) 2019 The LineageOS Project
+// Copyright (C) 2019-2024 The LineageOS Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,12 +15,11 @@
 cc_binary {
     name: "vendor.lineage.touch@1.0-service.samsung",
     init_rc: ["vendor.lineage.touch@1.0-service.samsung.rc"],
-    defaults: ["hidl_defaults"],
+    defaults: ["samsung_header_path_defaults"],
     relative_install_path: "hw",
     // FIXME: this should be 'vendor: true' for modules that will eventually be
     // on AOSP.
     proprietary: true,
-    local_include_dirs: ["include"],
     srcs: [
         "GloveMode.cpp",
         "KeyDisabler.cpp",

hidl/touch/GloveMode.h

@@ -19,7 +19,7 @@
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 #include <vendor/lineage/touch/1.0/IGloveMode.h>
-#include "samsung_touch.h"
+#include <samsung_touch.h>
 
 namespace vendor {
 namespace lineage {

hidl/touch/KeyDisabler.h

@@ -19,7 +19,7 @@
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 #include <vendor/lineage/touch/1.0/IKeyDisabler.h>
-#include "samsung_touch.h"
+#include <samsung_touch.h>
 
 namespace vendor {
 namespace lineage {

hidl/touch/StylusMode.h

@@ -19,7 +19,7 @@
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 #include <vendor/lineage/touch/1.0/IStylusMode.h>
-#include "samsung_touch.h"
+#include <samsung_touch.h>
 
 namespace vendor {
 namespace lineage {

hidl/touch/TouchscreenGesture.h

@@ -19,7 +19,7 @@
 #include <hidl/MQDescriptor.h>
 #include <hidl/Status.h>
 #include <vendor/lineage/touch/1.0/ITouchscreenGesture.h>
-#include "samsung_touch.h"
+#include <samsung_touch.h>
 
 namespace vendor {
 namespace lineage {