flo: move device-specific configs to vendor
Change-Id: I6812a60a27bfcd8f268e6b098152445933c6a5f7
This commit is contained in:
Artem Borisov
parent
708fd9a379
commit
34e6ad2e3e
|
|
@ -35,21 +35,21 @@
|
|||
#define WFC_UTIL_CFG_FILE_NAME "/data/misc/wifi/WCNSS_qcom_cfg.ini"
|
||||
#endif
|
||||
#ifndef WFC_UTIL_CFG_TEMPFILE_NAME
|
||||
#define WFC_UTIL_CFG_TEMPFILE_NAME "/system/etc/wifi/WCNSS_qcom_cfg.ini"
|
||||
#define WFC_UTIL_CFG_TEMPFILE_NAME "/vendor/etc/wifi/WCNSS_qcom_cfg.ini"
|
||||
#endif
|
||||
#else /* WLAN_CHIP_VERSION_WCN1314 */
|
||||
#ifndef WFC_UTIL_CFG_FILE_NAME
|
||||
#define WFC_UTIL_CFG_FILE_NAME "/data/misc/wifi/WCN1314_qcom_cfg.ini"
|
||||
#endif
|
||||
#ifndef WFC_UTIL_CFG_TEMPFILE_NAME
|
||||
#define WFC_UTIL_CFG_TEMPFILE_NAME "/system/etc/wifi/WCN1314_qcom_cfg.ini"
|
||||
#define WFC_UTIL_CFG_TEMPFILE_NAME "/vendor/etc/wifi/WCN1314_qcom_cfg.ini"
|
||||
#endif
|
||||
#endif /* WLAN_CHIP_VERSION_XXXX */
|
||||
|
||||
#ifdef WFC_UTIL_FEAUTRE_COPY_NV_BIN
|
||||
#ifdef WLAN_CHIP_VERSION_WCNSS
|
||||
#ifndef WFC_UTIL_NV_BIN_TEMPFILE_NAME
|
||||
#define WFC_UTIL_NV_BIN_TEMPFILE_NAME "/system/etc/wifi/WCNSS_qcom_wlan_nv.bin"
|
||||
#define WFC_UTIL_NV_BIN_TEMPFILE_NAME "/vendor/etc/wifi/WCNSS_qcom_wlan_nv.bin"
|
||||
#endif
|
||||
#ifndef WFC_UTIL_NV_BIN_FILE_NAME
|
||||
#define WFC_UTIL_NV_BIN_FILE_NAME "/data/misc/wifi/WCNSS_qcom_wlan_nv.bin"
|
||||
|
|
@ -554,9 +554,9 @@ int wfc_util_qcom_check_config(unsigned char *nv_mac_addr)
|
|||
// Default use WCNSS_qcom_wlan_nv_flo.bin
|
||||
property_get("ro.boot.baseband", baseband, "apq");
|
||||
if(!strncmp(baseband, "apq", 3)) {
|
||||
sprintf(nv_bin_tempfile_name, "/system/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin");
|
||||
sprintf(nv_bin_tempfile_name, "/vendor/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin");
|
||||
} else if( !strncmp(baseband, "mdm", 3)){
|
||||
sprintf(nv_bin_tempfile_name, "/system/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin");
|
||||
sprintf(nv_bin_tempfile_name, "/vendor/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin");
|
||||
}
|
||||
wfc_util_log_error("nv bin : %s", nv_bin_tempfile_name);
|
||||
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ PRODUCT_PACKAGES += \
|
|||
libaudio-resampler
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/asus/flo/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
|
||||
device/asus/flo/audio/audio_policy.conf:system/etc/audio_policy.conf \
|
||||
device/asus/flo/audio/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
|
||||
device/asus/flo/audio/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
|
||||
device/asus/flo/audio/mixer_paths.xml:system/etc/mixer_paths.xml
|
||||
|
||||
# Bluetooth
|
||||
|
|
@ -97,18 +97,18 @@ PRODUCT_PACKAGES += \
|
|||
|
||||
# IPC router config
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/asus/flo/configs/sec_config:system/etc/sec_config
|
||||
device/asus/flo/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config
|
||||
|
||||
# Keylayouts
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/asus/flo/keylayout/apq8064-tabla-snd-card_Button_Jack.kl:system/usr/keylayout/apq8064-tabla-snd-card_Button_Jack.kl \
|
||||
device/asus/flo/keylayout/hs_detect.kl:system/usr/keylayout/hs_detect.kl \
|
||||
device/asus/flo/keylayout/pmic8xxx_pwrkey.kl:system/usr/keylayout/pmic8xxx_pwrkey.kl \
|
||||
device/asus/flo/keylayout/keypad_8064.kl:system/usr/keylayout/keypad_8064.kl \
|
||||
device/asus/flo/keylayout/apq8064-tabla-snd-card_Button_Jack.kcm:system/usr/keychars/apq8064-tabla-snd-card_Button_Jack.kcm \
|
||||
device/asus/flo/keylayout/hs_detect.kcm:system/usr/keychars/hs_detect.kcm \
|
||||
device/asus/flo/keylayout/keypad_8064.kcm:system/usr/keychars/keypad_8064.kcm \
|
||||
device/asus/flo/keylayout/pmic8xxx_pwrkey.kcm:system/usr/keychars/pmic8xxx_pwrkey.kcm
|
||||
device/asus/flo/keylayout/apq8064-tabla-snd-card_Button_Jack.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/apq8064-tabla-snd-card_Button_Jack.kl \
|
||||
device/asus/flo/keylayout/hs_detect.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hs_detect.kl \
|
||||
device/asus/flo/keylayout/pmic8xxx_pwrkey.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/pmic8xxx_pwrkey.kl \
|
||||
device/asus/flo/keylayout/keypad_8064.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/keypad_8064.kl \
|
||||
device/asus/flo/keylayout/apq8064-tabla-snd-card_Button_Jack.kcm:$(TARGET_COPY_OUT_VENDOR)/usr/keychars/apq8064-tabla-snd-card_Button_Jack.kcm \
|
||||
device/asus/flo/keylayout/hs_detect.kcm:$(TARGET_COPY_OUT_VENDOR)/usr/keychars/hs_detect.kcm \
|
||||
device/asus/flo/keylayout/keypad_8064.kcm:$(TARGET_COPY_OUT_VENDOR)/usr/keychars/keypad_8064.kcm \
|
||||
device/asus/flo/keylayout/pmic8xxx_pwrkey.kcm:$(TARGET_COPY_OUT_VENDOR)/usr/keychars/pmic8xxx_pwrkey.kcm
|
||||
|
||||
# Keymaster
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
@ -129,11 +129,11 @@ PRODUCT_PACKAGES += \
|
|||
|
||||
# Media
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/asus/flo/configs/media_profiles.xml:system/etc/media_profiles.xml \
|
||||
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_video.xml:system/etc/media_codecs_google_video.xml \
|
||||
device/asus/flo/configs/media_codecs.xml:system/etc/media_codecs.xml \
|
||||
device/asus/flo/configs/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
|
||||
device/asus/flo/configs/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
|
||||
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
|
||||
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
|
||||
device/asus/flo/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
|
||||
device/asus/flo/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml
|
||||
|
||||
# Misc
|
||||
PRODUCT_CHARACTERISTICS := tablet,nosdcard
|
||||
|
|
@ -149,8 +149,8 @@ PRODUCT_PACKAGES += \
|
|||
Tag
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/asus/flo/configs/nfc/libnfc-brcm.conf:system/vendor/etc/libnfc-brcm.conf \
|
||||
device/asus/flo/configs/nfc/libnfc-brcm-20791b05.conf:system/vendor/etc/libnfc-brcm-20791b05.conf
|
||||
device/asus/flo/configs/nfc/libnfc-brcm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-brcm.conf \
|
||||
device/asus/flo/configs/nfc/libnfc-brcm-20791b05.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-brcm-20791b05.conf
|
||||
|
||||
# OMX
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
@ -165,23 +165,23 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
|||
|
||||
# Permissions/features
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
|
||||
frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
|
||||
frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
|
||||
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
|
||||
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
|
||||
frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
|
||||
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
|
||||
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
|
||||
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
|
||||
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
|
||||
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
|
||||
frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
|
||||
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
|
||||
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
|
||||
frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
|
||||
frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
|
||||
frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
|
||||
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
|
||||
frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml \
|
||||
frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
|
||||
frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
|
||||
frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
|
||||
frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
|
||||
frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \
|
||||
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \
|
||||
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
|
||||
frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml \
|
||||
frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml \
|
||||
frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
|
||||
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
|
||||
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \
|
||||
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
|
||||
frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
|
||||
frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
|
||||
|
||||
# Power
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
@ -204,7 +204,7 @@ PRODUCT_PACKAGES += \
|
|||
|
||||
# Sensors
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/configs/sensors/_hals.conf:system/vendor/etc/sensors/_hals.conf
|
||||
$(LOCAL_PATH)/configs/sensors/_hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/_hals.conf
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.sensors@1.0-impl \
|
||||
|
|
@ -216,8 +216,8 @@ PRODUCT_COPY_FILES += \
|
|||
|
||||
# Touchscreen calibration
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/asus/flo/configs/touch_dev.idc:system/usr/idc/touch_dev.idc \
|
||||
device/asus/flo/configs/elan-touchscreen.idc:system/usr/idc/elan-touchscreen.idc
|
||||
device/asus/flo/configs/touch_dev.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/touch_dev.idc \
|
||||
device/asus/flo/configs/elan-touchscreen.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/elan-touchscreen.idc
|
||||
|
||||
# USB HAL
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
@ -231,17 +231,17 @@ PRODUCT_PACKAGES += \
|
|||
wificond \
|
||||
hostapd \
|
||||
libwfcu \
|
||||
p2p_supplicant_overlay.conf \
|
||||
wpa_supplicant \
|
||||
wpa_supplicant.conf \
|
||||
wpa_supplicant_overlay.conf
|
||||
wpa_supplicant.conf
|
||||
|
||||
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_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_deb.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin
|
||||
device/asus/flo/wifi/WCNSS_cfg.dat:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/prima/WCNSS_cfg.dat \
|
||||
device/asus/flo/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \
|
||||
device/asus/flo/wifi/WCNSS_qcom_wlan_nv_flo.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
|
||||
device/asus/flo/wifi/WCNSS_qcom_wlan_nv_deb.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin \
|
||||
device/asus/flo/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
device/asus/flo/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
|
||||
|
||||
# Voice processing
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ on post-fs-data
|
|||
on property:init.svc.wpa_supplicant=stopped
|
||||
stop dhcpcd
|
||||
|
||||
service irsc_util /system/bin/irsc_util "/etc/sec_config"
|
||||
service irsc_util /system/bin/irsc_util "/vendor/etc/sec_config"
|
||||
class main
|
||||
user root
|
||||
oneshot
|
||||
|
|
@ -283,9 +283,9 @@ service sensors /system/bin/sensors.qcom
|
|||
|
||||
service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
|
||||
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
|
||||
-I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
|
||||
-I/vendor/etc/wifi/p2p_supplicant_overlay.conf -N \
|
||||
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
|
||||
-I/system/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
-I/vendor/etc/wifi/wpa_supplicant_overlay.conf \
|
||||
-puse_p2p_group_interface=1 \
|
||||
-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
|
||||
# we will start as root and wpa_supplicant will switch to user wifi
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2016 The CyanogenMod 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.
|
||||
#
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := wpa_supplicant_overlay.conf
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_MODULE_CLASS := ETC
|
||||
LOCAL_SRC_FILES := $(LOCAL_MODULE)
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := p2p_supplicant_overlay.conf
|
||||
LOCAL_MODULE_TAGS := optional
|
||||
LOCAL_MODULE_CLASS := ETC
|
||||
LOCAL_SRC_FILES := $(LOCAL_MODULE)
|
||||
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
|
||||
include $(BUILD_PREBUILT)
|
||||
|
||||
Loading…
Reference in New Issue