commit 6a4690c8fe5bb21c62125ce290453646bb0015da
author Simon Wilson <simonwilson@google.com> Thu Oct 08 15:32:28 2015 -0700
committer Simon Wilson <simonwilson@google.com> Thu Oct 08 15:32:28 2015 -0700
tree ee87a80cd794827357400f15e55ee2b65774f35b
parent 16237c4e17b1e2ab48dcec8a337b0129b8ec40e0

Allow alternative sensorhub implementation

Nanohub requires the use of an alternative Linux kernel,
sensor HALs, and related utils. When
TARGET_USES_CHINOOK_SENSORHUB is false or unset, use
the alternatives. The change also moves the
TARGET_USES_CHINOOK_SENSORHUB from vendor to device.
The variable is used in both places so the location
should be in device, not vendor (since vendor is
optional).

Change-Id: I94e6de4b09a5a95baef72e7d1be0652539555104

device.mk

diff --git a/device.mk b/device.mk
index bac85f2..006d277 100644
--- a/device.mk
+++ b/device.mk
@@ -19,11 +19,17 @@
 #
 # Everything in this directory will become public
 
+# Enable support for chinook sensorhub
+TARGET_USES_CHINOOK_SENSORHUB := true
 
 ifeq ($(TARGET_PREBUILT_KERNEL),)
-LOCAL_KERNEL := device/lge/bullhead-kernel/Image.gz-dtb
+  ifeq ($(TARGET_USES_CHINOOK_SENSORHUB),true)
+    LOCAL_KERNEL := device/lge/bullhead-kernel/Image.gz-dtb
+  else
+    LOCAL_KERNEL := vendor/google_contexthub/linux/bullhead/Image.gz-dtb
+  endif
 else
-LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
+  LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 endif
 
 PRODUCT_COPY_FILES := \
@@ -34,10 +40,17 @@
     device/lge/bullhead/init.bullhead.usb.rc:root/init.bullhead.usb.rc \
     device/lge/bullhead/fstab.bullhead:root/fstab.bullhead \
     device/lge/bullhead/ueventd.bullhead.rc:root/ueventd.bullhead.rc \
-    device/lge/bullhead/init.bullhead.sensorhub.rc:root/init.bullhead.sensorhub.rc \
     device/lge/bullhead/init.bullhead.ramdump.rc:root/init.bullhead.ramdump.rc \
     device/lge/bullhead/init.bullhead.fp.rc:root/init.bullhead.fp.rc
 
+ifeq ($(TARGET_USES_CHINOOK_SENSORHUB),true)
+PRODUCT_COPY_FILES += \
+    device/lge/bullhead/init.bullhead.sensorhub.rc:root/init.bullhead.sensorhub.rc
+else
+PRODUCT_COPY_FILES += \
+    device/lge/bullhead/init.bullhead.nanohub.rc:root/init.bullhead.sensorhub.rc
+endif
+
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
@@ -218,10 +231,16 @@
     mm-qcamera-app
 
 # Sensor & activity_recognition HAL
+ifeq ($(TARGET_USES_CHINOOK_SENSORHUB),true)
 PRODUCT_PACKAGES += \
     sensors.bullhead \
     activity_recognition.bullhead \
     sensortool.bullhead
+else
+PRODUCT_PACKAGES += \
+    sensors.default \
+    nanoapp_cmd
+endif
 
 PRODUCT_PACKAGES += \
     keystore.msm8992 \

init.bullhead.nanohub.rc

diff --git a/init.bullhead.nanohub.rc b/init.bullhead.nanohub.rc
new file mode 100644
index 0000000..63c3258
--- /dev/null
+++ b/init.bullhead.nanohub.rc
@@ -0,0 +1,2 @@
+on post-fs
+	write /sys/class/nanohub/nanohub/download_bl 1