flo: move device-specific modules to vendor
Change-Id: I79e26fe58dd393b9da04f3c99b3eadd263c40afa
This commit is contained in:
parent
40afda67f6
commit
708fd9a379
|
@ -28,6 +28,7 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_MODULE_OWNER := qcom
|
LOCAL_MODULE_OWNER := qcom
|
||||||
LOCAL_MODULE := bdAddrLoader
|
LOCAL_MODULE := bdAddrLoader
|
||||||
|
LOCAL_PROPRIETARY_MODULE := true
|
||||||
|
|
||||||
include $(BUILD_EXECUTABLE)
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
|
LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
|
||||||
LOCAL_MODULE := charger_touch
|
LOCAL_MODULE := charger_touch
|
||||||
LOCAL_MODULE_OWNER := qcom
|
LOCAL_MODULE_OWNER := qcom
|
||||||
|
LOCAL_PROPRIETARY_MODULE := true
|
||||||
include $(BUILD_EXECUTABLE)
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -33,6 +33,7 @@ endif
|
||||||
LOCAL_SHARED_LIBRARIES := libcutils liblog
|
LOCAL_SHARED_LIBRARIES := libcutils liblog
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_MODULE_OWNER := qcom
|
LOCAL_MODULE_OWNER := qcom
|
||||||
|
LOCAL_PROPRIETARY_MODULE := true
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
@ -41,9 +42,9 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog
|
||||||
LOCAL_SHARED_LIBRARIES += libwfcu
|
LOCAL_SHARED_LIBRARIES += libwfcu
|
||||||
LOCAL_CFLAGS += -Wall -Werror
|
LOCAL_CFLAGS += -Wall -Werror
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
|
|
||||||
LOCAL_MODULE := conn_init
|
LOCAL_MODULE := conn_init
|
||||||
LOCAL_MODULE_OWNER := qcom
|
LOCAL_MODULE_OWNER := qcom
|
||||||
|
LOCAL_PROPRIETARY_MODULE := true
|
||||||
|
|
||||||
# Make sure the symlinks get created as well.
|
# Make sure the symlinks get created as well.
|
||||||
LOCAL_POST_INSTALL_CMD := \
|
LOCAL_POST_INSTALL_CMD := \
|
||||||
|
|
|
@ -43,8 +43,10 @@ PRODUCT_COPY_FILES += \
|
||||||
# Bluetooth
|
# Bluetooth
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
bdAddrLoader \
|
bdAddrLoader \
|
||||||
hci_qcomm_init \
|
hci_qcomm_init
|
||||||
init.flo.bt.sh
|
|
||||||
|
PRODUCT_COPY_FILES += \
|
||||||
|
device/asus/flo/rootdir/etc/init.flo.bt.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.flo.bt.sh
|
||||||
|
|
||||||
# Bluetooth HAL
|
# Bluetooth HAL
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
@ -232,10 +234,10 @@ PRODUCT_PACKAGES += \
|
||||||
p2p_supplicant_overlay.conf \
|
p2p_supplicant_overlay.conf \
|
||||||
wpa_supplicant \
|
wpa_supplicant \
|
||||||
wpa_supplicant.conf \
|
wpa_supplicant.conf \
|
||||||
wpa_supplicant_overlay.conf \
|
wpa_supplicant_overlay.conf
|
||||||
init.flo.wifi.sh
|
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
device/asus/flo/rootdir/etc/init.flo.wifi.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.flo.wifi.sh \
|
||||||
device/asus/flo/wifi/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \
|
device/asus/flo/wifi/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \
|
||||||
device/asus/flo/wifi/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
|
device/asus/flo/wifi/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
|
||||||
device/asus/flo/wifi/WCNSS_qcom_wlan_nv_flo.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
|
device/asus/flo/wifi/WCNSS_qcom_wlan_nv_flo.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
|
||||||
|
|
|
@ -22,4 +22,5 @@ LOCAL_SRC_FILES := power_flo.c
|
||||||
LOCAL_SHARED_LIBRARIES := liblog libcutils
|
LOCAL_SHARED_LIBRARIES := liblog libcutils
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_MODULE := power.flo
|
LOCAL_MODULE := power.flo
|
||||||
|
LOCAL_PROPRIETARY_MODULE := true
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
|
@ -54,23 +54,3 @@ LOCAL_MODULE_CLASS := ETC
|
||||||
LOCAL_SRC_FILES := etc/ueventd.flo.rc
|
LOCAL_SRC_FILES := etc/ueventd.flo.rc
|
||||||
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
|
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
|
||||||
include $(BUILD_PREBUILT)
|
include $(BUILD_PREBUILT)
|
||||||
|
|
||||||
# Bluetooth/Wifi config scripts
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE := init.flo.bt.sh
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
|
||||||
LOCAL_MODULE_CLASS := ETC
|
|
||||||
LOCAL_SRC_FILES := etc/init.flo.bt.sh
|
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
|
|
||||||
include $(BUILD_PREBUILT)
|
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_MODULE := init.flo.wifi.sh
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
|
||||||
LOCAL_MODULE_CLASS := ETC
|
|
||||||
LOCAL_SRC_FILES := etc/init.flo.wifi.sh
|
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
|
|
||||||
include $(BUILD_PREBUILT)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -34,9 +34,9 @@ logi "DUTADDR : $DUTADDR"
|
||||||
#load bd addr
|
#load bd addr
|
||||||
if [$DUTADDR == ""]
|
if [$DUTADDR == ""]
|
||||||
then
|
then
|
||||||
BDADDR=`/system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x`
|
BDADDR=`/vendor/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x`
|
||||||
else
|
else
|
||||||
BDADDR=`/system/bin/bdAddrLoader -p net.btdut.address -s -x`
|
BDADDR=`/vendor/bin/bdAddrLoader -p net.btdut.address -s -x`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setprop bluetooth.status off
|
setprop bluetooth.status off
|
||||||
|
|
|
@ -225,7 +225,7 @@ service rmt_storage /system/bin/rmt_storage
|
||||||
user root
|
user root
|
||||||
group system
|
group system
|
||||||
|
|
||||||
service hciattach /system/bin/init.flo.bt.sh
|
service hciattach /vendor/bin/init.flo.bt.sh
|
||||||
class late_start
|
class late_start
|
||||||
user bluetooth
|
user bluetooth
|
||||||
group qcom_oncrpc bluetooth system
|
group qcom_oncrpc bluetooth system
|
||||||
|
@ -281,7 +281,7 @@ service sensors /system/bin/sensors.qcom
|
||||||
user root
|
user root
|
||||||
group root
|
group root
|
||||||
|
|
||||||
service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
|
service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
|
||||||
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
|
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
|
||||||
-I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
|
-I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
|
||||||
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||||
|
@ -361,13 +361,13 @@ service qcamerasvr /system/bin/mm-qcamera-daemon
|
||||||
user camera
|
user camera
|
||||||
group camera system inet input
|
group camera system inet input
|
||||||
|
|
||||||
service wcnss_init /system/bin/init.flo.wifi.sh
|
service wcnss_init /vendor/bin/init.flo.wifi.sh
|
||||||
class late_start
|
class late_start
|
||||||
user system
|
user system
|
||||||
group system wifi
|
group system wifi
|
||||||
oneshot
|
oneshot
|
||||||
|
|
||||||
service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x
|
service bdAddrLoader /vendor/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x
|
||||||
class main
|
class main
|
||||||
user bluetooth
|
user bluetooth
|
||||||
group system bluetooth
|
group system bluetooth
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
rm /data/misc/wifi/WCNSS_qcom_cfg.ini
|
rm /data/misc/wifi/WCNSS_qcom_cfg.ini
|
||||||
rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
|
rm /data/misc/wifi/WCNSS_qcom_wlan_nv.bin
|
||||||
|
|
||||||
/system/bin/conn_init
|
/vendor/bin/conn_init
|
||||||
|
|
||||||
echo 1 > /dev/wcnss_wlan
|
echo 1 > /dev/wcnss_wlan
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@
|
||||||
/data/fdAlbum u:object_r:camera_data_file:s0
|
/data/fdAlbum u:object_r:camera_data_file:s0
|
||||||
|
|
||||||
/system/bin/hci_qcomm_init u:object_r:hci_attach_exec:s0
|
/system/bin/hci_qcomm_init u:object_r:hci_attach_exec:s0
|
||||||
/system/bin/bdAddrLoader u:object_r:bluetooth_loader_exec:s0
|
/system/vendor/bin/bdAddrLoader u:object_r:bluetooth_loader_exec:s0
|
||||||
# rmt_storage is a qualcomm specific daemon responsible
|
# rmt_storage is a qualcomm specific daemon responsible
|
||||||
# for servicing modem filesystem requests.
|
# for servicing modem filesystem requests.
|
||||||
/system/bin/rmt_storage u:object_r:rmt_exec:s0
|
/system/bin/rmt_storage u:object_r:rmt_exec:s0
|
||||||
|
@ -125,10 +125,10 @@
|
||||||
/system/bin/sensors\.qcom u:object_r:sensors_exec:s0
|
/system/bin/sensors\.qcom u:object_r:sensors_exec:s0
|
||||||
/system/bin/mm-qcamera-daemon u:object_r:camera_exec:s0
|
/system/bin/mm-qcamera-daemon u:object_r:camera_exec:s0
|
||||||
/system/bin/qseecomd u:object_r:tee_exec:s0
|
/system/bin/qseecomd u:object_r:tee_exec:s0
|
||||||
/system/bin/conn_init u:object_r:conn_init_exec:s0
|
/system/vendor/bin/conn_init u:object_r:conn_init_exec:s0
|
||||||
/system/bin/init\.flo\.wifi\.sh u:object_r:conn_init_exec:s0
|
/system/vendor/bin/init\.flo\.wifi\.sh u:object_r:conn_init_exec:s0
|
||||||
/system/bin/irsc_util u:object_r:irsc_util_exec:s0
|
/system/bin/irsc_util u:object_r:irsc_util_exec:s0
|
||||||
/system/bin/init\.flo\.bt\.sh u:object_r:bluetooth_loader_exec:s0
|
/system/vendor/bin/init\.flo\.bt\.sh u:object_r:bluetooth_loader_exec:s0
|
||||||
|
|
||||||
# Persist firmware filesystem
|
# Persist firmware filesystem
|
||||||
/persist(/.*)? u:object_r:persist_file:s0
|
/persist(/.*)? u:object_r:persist_file:s0
|
||||||
|
|
|
@ -12,10 +12,14 @@ LOCAL_C_INCLUDES += \
|
||||||
|
|
||||||
LOCAL_MODULE := libqcomvoiceprocessingdescriptors
|
LOCAL_MODULE := libqcomvoiceprocessingdescriptors
|
||||||
|
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
|
LOCAL_MODULE_RELATIVE_PATH := soundfx
|
||||||
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
|
LOCAL_MODULE_OWNER := qcom
|
||||||
|
|
||||||
|
LOCAL_PROPRIETARY_MODULE := true
|
||||||
|
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue