aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErfan Abdi <erfangplus@gmail.com>2019-12-08 00:19:11 +0330
committerErfan Abdi <erfangplus@gmail.com>2020-06-29 10:26:01 +0200
commit4ae3b19025b0ebd439e4d6fc451e43005d9e759f (patch)
treef5005e3b76fabe6e9bc4ccf0a61201eff3bbb9e7
parentb36baed7f408bb901da5b7603b6b7539bd2a7192 (diff)
Revert "river: Drop NFC varient detection init"
This reverts commit e55073350430fac4e4e248700e935f5e82594898. * Also fix local module tag eng depreciation. Signed-off-by: Andrew Hexen <SyberHexen@gmail.com> Change-Id: I84d51b86387d9e76633f3140f51be737c1918ec0
-rw-r--r--device.mk4
-rw-r--r--rootdir/Android.mk13
-rw-r--r--rootdir/etc/init.river.rc29
3 files changed, 46 insertions, 0 deletions
diff --git a/device.mk b/device.mk
index 52f82e6..a2a9924 100644
--- a/device.mk
+++ b/device.mk
@@ -56,6 +56,10 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/keylayout/uinput-egis.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-egis.kl \
$(LOCAL_PATH)/idc/uinput-egis.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-egis.idc
+# Init
+PRODUCT_PACKAGES += \
+ init.river.rc
+
# NFC
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
new file mode 100644
index 0000000..c8868f4
--- /dev/null
+++ b/rootdir/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# Device init scripts
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := init.river.rc
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES := etc/init.river.rc
+LOCAL_VENDOR_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := init/hw
+include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/init.river.rc b/rootdir/etc/init.river.rc
new file mode 100644
index 0000000..9cc60d1
--- /dev/null
+++ b/rootdir/etc/init.river.rc
@@ -0,0 +1,29 @@
+# Copyright (c) 2009-2012, 2014-2018, The Linux Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of The Linux Foundation nor
+# the names of its contributors may be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+on init && property:ro.boot.hardware.sku=XT1962-5
+ setprop ro.boot.product.hardware.sku nfc