Merge pull request #5 from lissyx/merge_sony_lmr1_20160607

Merge sony lmr1 20160607
mozilla-b2g · Jun 7, 2016 · 013b3eb · 013b3eb
2 parents 7e4049d + 2d41e0c
commit 013b3eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/device.mk b/device.mk
@@ -18,7 +18,7 @@ DEVICE_PACKAGE_OVERLAYS := \
 # Device etc
 PRODUCT_COPY_FILES := \
     device/sony/seagull/rootdir/system/etc/mixer_paths.xml:system/etc/mixer_paths.xml \
-    device/sony/seagull/rootdir/system/etc/sensor_def_qcomdev.conf:system/etc/sensor_def_qcomdev.conf \
+    device/sony/seagull/rootdir/system/etc/sensors/sensor_def_qcomdev.conf:system/etc/sensors/sensor_def_qcomdev.conf \
     device/sony/seagull/rootdir/system/etc/thermanager.xml:system/etc/thermanager.xml \
     device/sony/seagull/rootdir/system/etc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
     device/sony/seagull/rootdir/system/etc/libnfc-nxp.conf:system/etc/libnfc-nxp.conf
@@ -65,4 +65,4 @@ PRODUCT_PROPERTY_OVERRIDES := \
 
 # Inherit from those products. Most specific first.
 $(call inherit-product, device/sony/yukon/platform.mk)
-$(call inherit-product-if-exists, vendor/sony/seagull/seagull-vendor.mk)
+$(call inherit-product-if-exists, vendor/sony/yukon-seagull/seagull-vendor.mk)
diff --git a/rootdir/system/etc/sensor_def_qcomdev.conf → ...ystem/etc/sensors/sensor_def_qcomdev.conf b/rootdir/system/etc/sensor_def_qcomdev.conf → ...ystem/etc/sensors/sensor_def_qcomdev.conf