zenfone6: Start using vendor_overlay
* This lets us override files in /vendor without
relying on bind mounts ^.^
* Remove too NEED_KERNEL_MODULE_SYSTEM
Change-Id: I94c244b0329d6f6cfe7efdc77e0a3ccc22ab8843
diff --git a/lights/Android.bp b/lights/Android.bp
deleted file mode 100644
index 30e9a1e..0000000
--- a/lights/Android.bp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2018 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-cc_binary {
- relative_install_path: "hw",
- defaults: ["hidl_defaults"],
- name: "android.hardware.light@2.0-service.asus_msmnile",
- init_rc: ["android.hardware.light@2.0-service.asus_msmnile.rc"],
- srcs: ["service.cpp", "Light.cpp"],
- shared_libs: [
- "android.hardware.light@2.0",
- "libbase",
- "libhardware",
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- ],
-}
diff --git a/lights/Android.mk b/lights/Android.mk
new file mode 100644
index 0000000..98616ca
--- /dev/null
+++ b/lights/Android.mk
@@ -0,0 +1,42 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := android.hardware.light@2.0-service.asus_msmnile
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/bin
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_MODULE_STEM := android.hardware.light@2.0-service
+
+LOCAL_SRC_FILES := \
+ service.cpp \
+ Light.cpp
+
+LOCAL_REQUIRED_MODULES := \
+ android.hardware.light@2.0-service.asus_msmnile.rc
+
+LOCAL_SHARED_LIBRARIES := \
+ libbase \
+ libhardware \
+ libhidlbase \
+ libhidltransport \
+ liblog \
+ libhwbinder \
+ libutils \
+ android.hardware.light@2.0
+
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := android.hardware.light@2.0-service.asus_msmnile.rc
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/init
+LOCAL_MODULE_STEM := android.hardware.light@2.0-service.rc
+
+LOCAL_SRC_FILES := android.hardware.light@2.0-service.asus_msmnile.rc
+
+include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/lights/android.hardware.light@2.0-service.asus_msmnile.rc b/lights/android.hardware.light@2.0-service.asus_msmnile.rc
index 22e6708..b54ca95 100644
--- a/lights/android.hardware.light@2.0-service.asus_msmnile.rc
+++ b/lights/android.hardware.light@2.0-service.asus_msmnile.rc
@@ -1,4 +1,4 @@
-service vendor.light-hal-2-0 /system/bin/hw/android.hardware.light@2.0-service.asus_msmnile
+service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service
interface android.hardware.light@2.0::ILight default
class hal
user system