From a592795621019fb40e9e7cf889c48d830747f0e2 Mon Sep 17 00:00:00 2001
From: PIPIPIG233666 <pig.priv@gmail.com>
Date: Fri, 18 Sep 2020 10:02:46 -0400
Subject: [PATCH] sdm660-common: light: Move hidl to a seperate directory

Change-Id: If75aa890c24a60534c17d410bc2d1318c59cc5ec
Signed-off-by: pix106 <sbordenave@gmail.com>
---
 light/Android.bp                              | 25 ++++++++++++++++---
 light/aidl/Android.bp                         | 18 -------------
 light/{ => hidl}/Light.cpp                    |  0
 light/{ => hidl}/Light.h                      |  0
 ...ardware.light@2.0-service.xiaomi_sdm660.rc |  0
 ...rdware.light@2.0-service.xiaomi_sdm660.xml |  0
 light/{ => hidl}/service.cpp                  |  0
 7 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 light/aidl/Android.bp
 rename light/{ => hidl}/Light.cpp (100%)
 rename light/{ => hidl}/Light.h (100%)
 rename light/{ => hidl}/android.hardware.light@2.0-service.xiaomi_sdm660.rc (100%)
 rename light/{ => hidl}/android.hardware.light@2.0-service.xiaomi_sdm660.xml (100%)
 rename light/{ => hidl}/service.cpp (100%)

diff --git a/light/Android.bp b/light/Android.bp
index e42cc41f..4c31a322 100644
--- a/light/Android.bp
+++ b/light/Android.bp
@@ -5,9 +5,9 @@
 cc_binary {
     defaults: ["hidl_defaults"],
     name: "android.hardware.light@2.0-service.xiaomi_sdm660",
-    init_rc: ["android.hardware.light@2.0-service.xiaomi_sdm660.rc"],
-    vintf_fragments: ["android.hardware.light@2.0-service.xiaomi_sdm660.xml"],
-    srcs: ["service.cpp", "Light.cpp"],
+    init_rc: ["hidl/android.hardware.light@2.0-service.xiaomi_sdm660.rc"],
+    vintf_fragments: ["hidl/android.hardware.light@2.0-service.xiaomi_sdm660.xml"],
+    srcs: ["hidl/service.cpp", "hidl/Light.cpp"],
     shared_libs: [
         "libbase",
         "libhidlbase",
@@ -17,3 +17,22 @@ cc_binary {
     relative_install_path : "hw",
     vendor: true,
 }
+
+cc_binary {
+    name: "android.hardware.lights-service.qti",
+    relative_install_path: "hw",
+    init_rc: ["aidl/android.hardware.lights-qti.rc"],
+    vintf_fragments: ["aidl/android.hardware.lights-qti.xml"],
+    vendor: true,
+    shared_libs: [
+        "libbase",
+        "liblog",
+        "libhardware",
+        "libbinder_ndk",
+        "android.hardware.light-ndk_platform",
+    ],
+    srcs: [
+        "aidl/Lights.cpp",
+        "aidl/main.cpp",
+    ],
+}
diff --git a/light/aidl/Android.bp b/light/aidl/Android.bp
deleted file mode 100644
index cd4c44ee..00000000
--- a/light/aidl/Android.bp
+++ /dev/null
@@ -1,18 +0,0 @@
-cc_binary {
-    name: "android.hardware.lights-service.qti",
-    relative_install_path: "hw",
-    init_rc: ["android.hardware.lights-qti.rc"],
-    vintf_fragments: ["android.hardware.lights-qti.xml"],
-    vendor: true,
-    shared_libs: [
-        "libbase",
-        "liblog",
-        "libhardware",
-        "libbinder_ndk",
-        "android.hardware.light-ndk_platform",
-    ],
-    srcs: [
-        "Lights.cpp",
-        "main.cpp",
-    ],
-}
diff --git a/light/Light.cpp b/light/hidl/Light.cpp
similarity index 100%
rename from light/Light.cpp
rename to light/hidl/Light.cpp
diff --git a/light/Light.h b/light/hidl/Light.h
similarity index 100%
rename from light/Light.h
rename to light/hidl/Light.h
diff --git a/light/android.hardware.light@2.0-service.xiaomi_sdm660.rc b/light/hidl/android.hardware.light@2.0-service.xiaomi_sdm660.rc
similarity index 100%
rename from light/android.hardware.light@2.0-service.xiaomi_sdm660.rc
rename to light/hidl/android.hardware.light@2.0-service.xiaomi_sdm660.rc
diff --git a/light/android.hardware.light@2.0-service.xiaomi_sdm660.xml b/light/hidl/android.hardware.light@2.0-service.xiaomi_sdm660.xml
similarity index 100%
rename from light/android.hardware.light@2.0-service.xiaomi_sdm660.xml
rename to light/hidl/android.hardware.light@2.0-service.xiaomi_sdm660.xml
diff --git a/light/service.cpp b/light/hidl/service.cpp
similarity index 100%
rename from light/service.cpp
rename to light/hidl/service.cpp