aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArian <arian.kulmer@web.de>2019-08-11 18:15:55 +0200
committerArian <arian.kulmer@web.de>2019-10-25 22:16:13 +0200
commit1c834a13e8494d25b730a75664c0cdf41e9a9709 (patch)
tree458e729690b05acfc348bf61cce7455979362d15
parent47b8e3eaf367b08a8aeb0253cad9fb22bb8ac925 (diff)
shinano-common: Update proprietary-files.txt for Android 9
* Radio blobs taken from SW_binaries_for_Xperia_AOSP_M_MR1_3.10_v13_legacy.zip * NFC HAL from 8.1.0 Change-Id: Ic73bc81077cbd53cc1398b91d1a278de7e505988
-rw-r--r--configs/ad_calib.cfg111
-rw-r--r--configs/dsi_config.xml205
-rw-r--r--configs/netmgr_config.xml512
-rw-r--r--configs/qmi_config.xml154
-rwxr-xr-xextract-files.sh51
-rw-r--r--proprietary-files.txt376
-rw-r--r--rootdir/init.camera.rc9
-rwxr-xr-xsetup-makefiles.sh30
-rw-r--r--shinano.mk12
-rw-r--r--system_prop.mk2
-rw-r--r--tfa9890/tfa9890.h63
11 files changed, 283 insertions, 1242 deletions
diff --git a/configs/ad_calib.cfg b/configs/ad_calib.cfg
deleted file mode 100644
index f1dbe87..0000000
--- a/configs/ad_calib.cfg
+++ /dev/null
@@ -1,111 +0,0 @@
-# Assertive Display Calibration Output File Format
-# Calibration config file consists of one or more sections. Each section is set
-# of parameter values stored on one line each. Number of parameters (hence number
-# of lines in each section is fixed. Order in which parameters are specified in
-# given section is fixed as well.
-# Comments are supported in configuration file to improve readability of
-# calibration configuration parameters. Any line begining with '#' is considered
-# as comment and will not be processed further.
-# Blank lines are allowed and are ignored. They can be used to improve
-# readability of assertive display calibration output file.
-# Sections: Any line begining with '=' indicates start of new section in
-# calibration output file. Sections, parameters which are part of section and
-# order in which they will appear in calibration output file is kept outside
-# scope of this documentation in order to have flexibility in development of
-# assertive display calibration system. This information can be shared between
-# APICAL and Qualcomm as part of assertive display bring ups on given platforms.
-# There should not be any spaces betweetn '=' and section name.
-# Version 1.0 of calibration output format supports following sections:
-# version - Contains assertive display calibration output file format version
-# init - Contains assertive display parameters which are independent of
-# assertive display mode
-# config - Contains assertive display parameters which are dependent on specific
-# assertive display mode
-# Each parameter for assertive display calibration is stored on new line. If
-# parameter consists of more than one values (set of values), each value is
-# separated by single space (' ') character. In version 1.0 of assertive
-# display calibration output file format, all numerical values are in decimal
-# unsigned integer format, limited by 32 bits. Range for values or valid value
-# for given parameter is outside scope of this documentation. This information
-# can be shared between APICAL and Qualcomm as part of assertive display bring
-# ups on given platforms.
-# Version 1.1 adds two more init parameters (21 in total) to the config file to support the
-# newly added power saving feature, Parameters added are alpha and BL_ATT lut
-# Version 1.2 adds two more init parameters (23 in total) to the config file to support the
-# driver change, Parameters added are ALS_offset and ALS_threshold
-# Version 1.3 changes the parameters BL linearity LUT and BL inverse LUT
-# from 8 bit to 12 bits. This is done to support the precision increase in the AD Driver
-=version
-1.3
-# APICAL mode indepent initialization Params
-=init
-# A
-0 211 414 609 796 975 1148 1315 1475 1630 1779 1922 2061 2195 2325 2451 2572 2690 2804 2915 3022 3126 3227 3325 3420 3513 3603 3691 3776 3859 3940 4019 4095
-# B
-255 278 302 326 350 374 398 422 446 470 494 517 541 565 589 613 637 661 684 708 732 755 779 803 826 850 874 897 921 945 968 992 1016
-# C
-7 134
-# D
-0
-# E
-1023
-# F
-65
-# G
-240
-# H
-0
-# I
-60
-# J
-128
-# dither_control
-5
-# L
-3
-# M
-0
-# frame_width
-1080
-# frame_height
-1920
-# P
-0
-# Q
-0
-# BL_linearity_LUT
-0 16 32 48 64 80 96 112 128 145 161 177 193 209 225 241 257 273 289 305 321 337 353 369 385 401 418 434 450 466 482 498 514 530 546 562 578 594 610 626 642 658 674 691 707 723 739 755 771 787 803 819 835 851 867 883 899 915 931 947 964 980 996 1012 1028 1044 1060 1076 1092 1108 1124 1140 1156 1172 1188 1204 1220 1237 1253 1269 1285 1301 1317 1333 1349 1365 1381 1397 1413 1429 1445 1461 1477 1493 1510 1526 1542 1558 1574 1590 1606 1622 1638 1654 1670 1686 1702 1718 1734 1750 1766 1783 1799 1815 1831 1847 1863 1879 1895 1911 1927 1943 1959 1975 1991 2007 2023 2039 2056 2072 2088 2104 2120 2136 2152 2168 2184 2200 2216 2232 2248 2264 2280 2296 2312 2329 2345 2361 2377 2393 2409 2425 2441 2457 2473 2489 2505 2521 2537 2553 2569 2585 2602 2618 2634 2650 2666 2682 2698 2714 2730 2746 2762 2778 2794 2810 2826 2842 2858 2875 2891 2907 2923 2939 2955 2971 2987 3003 3019 3035 3051 3067 3083 3099 3115 3131 3148 3164 3180 3196 3212 3228 3244 3260 3276 3292 3308 3324 3340 3356 3372 3388 3404 3421 3437 3453 3469 3485 3501 3517 3533 3549 3565 3581 3597 3613 3629 3645 3661 3677 3694 3710 3726 3742 3758 3774 3790 3806 3822 3838 3854 3870 3886 3902 3918 3934 3950 3967 3983 3999 4015 4031 4047 4063 4079 4095
-# BL_linearity_inverse_LUT
-0 16 32 48 64 80 96 112 128 145 161 177 193 209 225 241 257 273 289 305 321 337 353 369 385 401 418 434 450 466 482 498 514 530 546 562 578 594 610 626 642 658 674 691 707 723 739 755 771 787 803 819 835 851 867 883 899 915 931 947 964 980 996 1012 1028 1044 1060 1076 1092 1108 1124 1140 1156 1172 1188 1204 1220 1237 1253 1269 1285 1301 1317 1333 1349 1365 1381 1397 1413 1429 1445 1461 1477 1493 1510 1526 1542 1558 1574 1590 1606 1622 1638 1654 1670 1686 1702 1718 1734 1750 1766 1783 1799 1815 1831 1847 1863 1879 1895 1911 1927 1943 1959 1975 1991 2007 2023 2039 2056 2072 2088 2104 2120 2136 2152 2168 2184 2200 2216 2232 2248 2264 2280 2296 2312 2329 2345 2361 2377 2393 2409 2425 2441 2457 2473 2489 2505 2521 2537 2553 2569 2585 2602 2618 2634 2650 2666 2682 2698 2714 2730 2746 2762 2778 2794 2810 2826 2842 2858 2875 2891 2907 2923 2939 2955 2971 2987 3003 3019 3035 3051 3067 3083 3099 3115 3131 3148 3164 3180 3196 3212 3228 3244 3260 3276 3292 3308 3324 3340 3356 3372 3388 3404 3421 3437 3453 3469 3485 3501 3517 3533 3549 3565 3581 3597 3613 3629 3645 3661 3677 3694 3710 3726 3742 3758 3774 3790 3806 3822 3838 3854 3870 3886 3902 3918 3934 3950 3967 3983 3999 4015 4031 4047 4063 4079 4095
-# power_saving_coeff
-0
-# BL_att_LUT
-0 128 256 384 512 539 567 594 622 649 676 704 768 832 896 960 1024 1088 1152 1216 1280 1612 1945 2278 2611 2943 3327 3455 3583 3711 3839 3967 4095
-# al_offset
-10000
-# al_tolarance
-0.2
-#APICAL mode specific configuration
-=config
-# mode
-1
-# R
-0 0 0 6144 8192 10240 12288 14336 16384 18432 20480 22528 24576 26624 28672 30720 32768 34815 36863 38911 40959 43007 45055 47103 49151 51199 53247 55295 57343 59391 61439 63487 65535
-# back_min
-0
-# back_max
-4095
-# back_scale
-4095
-# ambient_light_min
-0
-# S
-1738 6
-# calibration_abcd
-14 95 0 0
-# T
-140
-# U
-3
-# V
-60 \ No newline at end of file
diff --git a/configs/dsi_config.xml b/configs/dsi_config.xml
deleted file mode 100644
index c9a69c0..0000000
--- a/configs/dsi_config.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list name="dsi_config">
-
- <!-- Configuration for legacy MSM targets -->
- <listitem name="msm">
-
- <data name="qos_enabled" type="int"> 0 </data>
- <data name="rmnet_data_enabled" type="int"> 0 </data>
- <data name="phys_net_dev" type="string"> rmnet0 </data>
-
- <data name="single_qmux_channel_enabled" type="int"> 0 </data>
- <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
-
- <data name="num_dsi_handles" type="int"> 8 </data>
- <list name="device_names">
- <data type="string"> rmnet0 </data>
- <data type="string"> rmnet1 </data>
- <data type="string"> rmnet2 </data>
- <data type="string"> rmnet3 </data>
- <data type="string"> rmnet4 </data>
- <data type="string"> rmnet5 </data>
- <data type="string"> rmnet6 </data>
- <data type="string"> rmnet7 </data>
- </list>
-
- <list name="control_port_names">
- <data type="string"> rmnet0 </data>
- <data type="string"> rmnet1 </data>
- <data type="string"> rmnet2 </data>
- <data type="string"> rmnet3 </data>
- <data type="string"> rmnet4 </data>
- <data type="string"> rmnet5 </data>
- <data type="string"> rmnet6 </data>
- <data type="string"> rmnet7 </data>
- </list>
- </listitem>
-
- <!-- Configuration for fusion4 -->
- <listitem name="mdm">
-
- <data name="qos_enabled" type="int"> 0 </data>
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="phys_net_dev" type="string"> rmnet_usb0 </data>
-
- <data name="single_qmux_channel_enabled" type="int"> 0 </data>
- <data name="single_qmux_channel_name" type="string"> rmnet_usb0 </data>
-
- <data name="num_dsi_handles" type="int"> 8 </data>
- <list name="device_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <list name="control_port_names">
- <data type="string"> rmnet_usb0 </data>
- <data type="string"> rmnet_usb1 </data>
- <data type="string"> rmnet_usb2 </data>
- <data type="string"> rmnet_usb3 </data>
- <data type="string"> rmnet_usb4 </data>
- <data type="string"> rmnet_usb5 </data>
- <data type="string"> rmnet_usb6 </data>
- <data type="string"> rmnet_usb7 </data>
- </list>
- </listitem>
-
- <!-- Configuration for dpm_2_0 targets -->
- <listitem name="dpm_2_0">
- <data name="qos_enabled" type="int"> 1 </data>
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="phys_net_dev" type="string"> rmnet0 </data>
- <data name="single_qmux_channel_enabled" type="int"> 1 </data>
- <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
- <data name="num_dsi_handles" type="int"> 8 </data>
- <list name="device_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
- <list name="control_port_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
- </listitem>
-
- <!-- Configuration for MSM8994 -->
- <listitem name="msm8994">
-
- <data name="qos_enabled" type="int"> 1 </data>
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-
- <data name="single_qmux_channel_enabled" type="int"> 1 </data>
- <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
-
- <data name="num_dsi_handles" type="int"> 8 </data>
- <list name="device_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <list name="control_port_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
- </listitem>
-
- <!-- Configuration for MSM8976 -->
- <listitem name="Eldarion">
-
- <data name="qos_enabled" type="int"> 1 </data>
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-
- <data name="single_qmux_channel_enabled" type="int"> 1 </data>
- <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
-
- <data name="num_dsi_handles" type="int"> 8 </data>
- <list name="device_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <list name="control_port_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- </listitem>
-
- <!-- Configuration for MSM8996 -->
- <listitem name="msm8996">
-
- <data name="qos_enabled" type="int"> 1 </data>
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-
- <data name="single_qmux_channel_enabled" type="int"> 1 </data>
- <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
-
- <data name="num_dsi_handles" type="int"> 8 </data>
- <list name="device_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <list name="control_port_names">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
- </listitem>
-</list>
-
diff --git a/configs/netmgr_config.xml b/configs/netmgr_config.xml
deleted file mode 100644
index 904074f..0000000
--- a/configs/netmgr_config.xml
+++ /dev/null
@@ -1,512 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- QMI configuration -->
-<list name="netmgr_config">
- <!-- Logging overrides for ds_exec() family of commands -->
- <!-- Remove the 'disabled_' from the properties to enable them -->
- <listitem name = "cmd_logging_config">
- <data name="disabled_log_options" type="int"> 255 </data>
- <data name="disabled_cmd_debug" type="int"> 1 </data>
- <data name="disabled_outfile" type="string"> /data/netmgr_cmd_log.txt </data>
- </listitem>
-
- <!-- Legacy MSM targets -->
- <listitem name = "msm">
-
- <data name="qmi_dpm_enabled" type="int"> 0 </data>
- <data name="wda_data_format_enabled" type="int"> 0 </data>
-
- <data name="single_qmux_ch_enabled" type="int"> 0 </data>
- <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
- <data name="single_qmux_ch_name" type="string"> SMDCTL0 </data>
-
- <data name="rmnet_data_enabled" type="int"> 0 </data>
- <data name="dataformat_agg_dl_pkt" type="int"> 0 </data>
- <data name="dataformat_agg_dl_size" type="int"> 0 </data>
- <data name="dataformat_dl_data_aggregation_protocol" type="int"> 0 </data>
- <data name="dataformat_ul_data_aggregation_protocol" type="int"> 0 </data>
- <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
- <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
- <data name="phys_net_dev" type="string"> rmnet0 </data>
- <data name="tc_ul_baserate" type="int"> 0 </data>
- <data name="pnd_rps_mask" type="int"> 0 </data>
- <data name="netdev_budget" type="int"> 0 </data>
-
- <data name="low_latency_filters" type="int"> 0 </data>
-
- <data name="num_modems" type="int"> 2 </data>
- <list name="modems_enabled">
- <data type="int"> 1 </data> <!-- MODEM_MSM -->
- <data type="int"> 0 </data> <!-- MODEM_MDM -->
- </list>
-
- <data name="control_ports_len" type="int"> 8 </data>
- <list name="control_ports">
- <data type="string"> rmnet0 </data>
- <data type="string"> rmnet1 </data>
- <data type="string"> rmnet2 </data>
- <data type="string"> rmnet3 </data>
- <data type="string"> rmnet4 </data>
- <data type="string"> rmnet5 </data>
- <data type="string"> rmnet6 </data>
- <data type="string"> rmnet7 </data>
- </list>
-
- <data name="data_ports_len" type="int"> 8 </data>
- <list name="data_ports">
- <data type="string"> rmnet0 </data>
- <data type="string"> rmnet1 </data>
- <data type="string"> rmnet2 </data>
- <data type="string"> rmnet3 </data>
- <data type="string"> rmnet4 </data>
- <data type="string"> rmnet5 </data>
- <data type="string"> rmnet6 </data>
- <data type="string"> rmnet7 </data>
- </list>
-
- <data name="iwlan_enable" type="int"> 1 </data>
- <data name="rev_control_ports_len" type="int"> 9 </data>
- <list name="rev_control_ports">
- <data type="string"> rev_rmnet0 </data>
- <data type="string"> rev_rmnet1 </data>
- <data type="string"> rev_rmnet2 </data>
- <data type="string"> rev_rmnet3 </data>
- <data type="string"> rev_rmnet4 </data>
- <data type="string"> rev_rmnet5 </data>
- <data type="string"> rev_rmnet6 </data>
- <data type="string"> rev_rmnet7 </data>
- <data type="string"> rev_rmnet8 </data>
- </list>
-
- <data name="rev_data_ports_len" type="int"> 9 </data>
- <list name="rev_data_ports">
- <data type="string"> rev_rmnet0 </data>
- <data type="string"> rev_rmnet1 </data>
- <data type="string"> rev_rmnet2 </data>
- <data type="string"> rev_rmnet3 </data>
- <data type="string"> rev_rmnet4 </data>
- <data type="string"> rev_rmnet5 </data>
- <data type="string"> rev_rmnet6 </data>
- <data type="string"> rev_rmnet7 </data>
- <data type="string"> rev_rmnet8 </data>
- </list>
- </listitem>
-
- <!-- Fusion4 parameters -->
- <listitem name = "mdm">
-
- <data name="qmi_dpm_enabled" type="int"> 0 </data>
- <data name="wda_data_format_enabled" type="int"> 1 </data>
-
- <data name="single_qmux_ch_enabled" type="int"> 0 </data>
- <data name="single_qmux_ch_conn_id_str" type="string"> rmnet_usb0 </data>
- <data name="single_qmux_ch_name" type="string"> HSICTL0 </data>
-
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
- <data name="dataformat_agg_dl_size" type="int"> 4096 </data>
- <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
- <data name="dataformat_agg_ul_size" type="int"> 0 </data>
- <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
- <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
- <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
- <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
- <data name="phys_net_dev" type="string"> rmnet_usb0 </data>
- <data name="tc_ul_baserate" type="int"> 0 </data>
- <data name="pnd_rps_mask" type="int"> 0 </data>
- <data name="netdev_budget" type="int"> 0 </data>
-
- <data name="low_latency_filters" type="int"> 1 </data>
-
- <data name="num_modems" type="int"> 2 </data>
- <list name="modems_enabled">
- <data type="int"> 1 </data> <!-- MODEM_MSM -->
- <data type="int"> 0 </data> <!-- MODEM_MDM -->
- </list>
-
- <data name="control_ports_len" type="int"> 8 </data>
- <list name="control_ports">
- <data type="string"> rmnet_usb0 </data>
- <data type="string"> rmnet_usb1 </data>
- <data type="string"> rmnet_usb2 </data>
- <data type="string"> rmnet_usb3 </data>
- <data type="string"> rmnet_usb4 </data>
- <data type="string"> rmnet_usb5 </data>
- <data type="string"> rmnet_usb6 </data>
- <data type="string"> rmnet_usb7 </data>
- </list>
-
- <data name="data_ports_len" type="int"> 8 </data>
- <list name="data_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <data name="iwlan_enable" type="int"> 1 </data>
- <data name="rev_control_ports_len" type="int"> 9 </data>
- <list name="rev_control_ports">
- <data type="string"> rev_rmnet_usb0 </data>
- <data type="string"> rev_rmnet_usb1 </data>
- <data type="string"> rev_rmnet_usb2 </data>
- <data type="string"> rev_rmnet_usb3 </data>
- <data type="string"> rev_rmnet_usb4 </data>
- <data type="string"> rev_rmnet_usb5 </data>
- <data type="string"> rev_rmnet_usb6 </data>
- <data type="string"> rev_rmnet_usb7 </data>
- <data type="string"> rev_rmnet_usb8 </data>
- </list>
-
- <data name="rev_data_ports_len" type="int"> 9 </data>
- <list name="rev_data_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
- </listitem>
-
- <!-- DPM 2.0 parameters -->
- <listitem name = "dpm_2_0">
- <data name="qmi_dpm_enabled" type="int"> 0 </data>
- <data name="wda_data_format_enabled" type="int"> 1 </data>
- <data name="single_qmux_ch_enabled" type="int"> 1 </data>
- <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
- <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
- <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
- <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
- <data name="dataformat_agg_ul_size" type="int"> 0 </data>
- <data name="dataformat_dl_data_aggregation_protocol" type="int"> 5 </data>
- <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
- <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
- <data name="phys_net_dev" type="string"> rmnet0 </data>
- <data name="pnd_rps_mask" type="int"> 16 </data>
- <data name="qos_via_idl" type="int"> 0 </data>
- <data name="netdev_budget" type="int"> 0 </data>
- <data name="low_latency_filters" type="int"> 0 </data>
- <data name="num_modems" type="int"> 2 </data>
- <list name="modems_enabled">
- <data type="int"> 1 </data> <!-- MODEM_MSM -->
- <data type="int"> 0 </data> <!-- MODEM_MDM -->
- </list>
- <data name="control_ports_len" type="int"> 8 </data>
- <list name="control_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
- <data name="data_ports_len" type="int"> 8 </data>
- <list name="data_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
- <data name="iwlan_enable" type="int"> 0 </data>
- <data name="rev_control_ports_len" type="int"> 9 </data>
- <list name="rev_control_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
- <data name="rev_data_ports_len" type="int"> 9 </data>
- <list name="rev_data_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
- </listitem>
-
- <!-- MSM8994 parameters -->
- <listitem name = "msm8994">
-
- <data name="qmi_dpm_enabled" type="int"> 1 </data>
- <data name="dpm_retry_timeout" type="int"> 10000 </data>
- <data name="wda_data_format_enabled" type="int"> 1 </data>
-
- <data name="single_qmux_ch_enabled" type="int"> 1 </data>
- <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
- <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
-
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="dataformat_agg_dl_pkt" type="int"> 1 </data>
- <data name="dataformat_agg_dl_size" type="int"> 2048 </data>
- <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
- <data name="dataformat_agg_ul_size" type="int"> 0 </data>
- <data name="dataformat_dl_data_aggregation_protocol" type="int"> 7 </data>
- <data name="dataformat_ul_data_aggregation_protocol" type="int"> 5 </data>
- <data name="dataformat_dl_gro_enabled" type="int"> 0 </data>
- <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
- <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
- <data name="pnd_rps_mask" type="int"> 0 </data>
- <data name="qos_via_idl" type="int"> 0 </data>
- <data name="netdev_budget" type="int"> 0 </data>
- <data name="low_latency_filters" type="int"> 0 </data>
- <data name="netdev_max_backlog" type="int"> 10000 </data>
- <data name="tc_ul_baserate" type="int"> 55000000 </data>
- <data name="num_modems" type="int"> 2 </data>
- <list name="modems_enabled">
- <data type="int"> 1 </data> <!-- MODEM_MSM -->
- <data type="int"> 0 </data> <!-- MODEM_MDM -->
- </list>
-
- <data name="control_ports_len" type="int"> 8 </data>
- <list name="control_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <data name="data_ports_len" type="int"> 8 </data>
- <list name="data_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <!-- iWLAN ports -->
- <data name="iwlan_enable" type="int"> 1 </data>
- <data name="rev_control_ports_len" type="int"> 9 </data>
- <list name="rev_control_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
-
- <data name="rev_data_ports_len" type="int"> 9 </data>
- <list name="rev_data_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
- </listitem>
-
- <!-- MSM8976 parameters -->
- <listitem name = "Eldarion">
-
- <data name="qmi_dpm_enabled" type="int"> 1 </data>
- <data name="dpm_retry_timeout" type="int"> 10000 </data>
- <data name="wda_data_format_enabled" type="int"> 1 </data>
-
- <data name="single_qmux_ch_enabled" type="int"> 1 </data>
- <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
- <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
- <data name="tc_ul_baserate" type="int"> 0 </data>
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
- <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
- <data name="dataformat_dl_data_aggregation_protocol" type="int"> 7 </data>
- <data name="dataformat_ul_data_aggregation_protocol" type="int"> 7 </data>
- <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
- <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
- <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-
- <data name="pnd_rps_mask" type="int"> 01 </data>
- <data name="netdev_budget" type="int"> 0 </data>
- <data name="low_latency_filters" type="int"> 0 </data>
-
- <data name="num_modems" type="int"> 2 </data>
- <list name="modems_enabled">
- <data type="int"> 1 </data> <!-- MODEM_MSM -->
- <data type="int"> 0 </data> <!-- MODEM_MDM -->
- </list>
-
- <data name="control_ports_len" type="int"> 8 </data>
- <list name="control_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <data name="data_ports_len" type="int"> 8 </data>
- <list name="data_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <!-- iWLAN ports -->
- <data name="iwlan_enable" type="int"> 1 </data>
- <data name="rev_control_ports_len" type="int"> 9 </data>
- <list name="rev_control_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
-
- <data name="rev_data_ports_len" type="int"> 9 </data>
- <list name="rev_data_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
- </listitem>
-
- <!-- MSM8996 parameters -->
- <listitem name = "msm8996">
-
- <data name="qmi_dpm_enabled" type="int"> 1 </data>
- <data name="use_qmuxd" type="int"> 0 </data>
- <data name="dpm_retry_timeout" type="int"> 10000 </data>
- <data name="wda_data_format_enabled" type="int"> 1 </data>
-
- <data name="single_qmux_ch_enabled" type="int"> 1 </data>
- <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
- <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
- <data name="tc_ul_baserate" type="int"> 155000000 </data>
- <data name="dynamic_tc_ul_baserate" type="int"> 1 </data>
- <data name="tc_ul_burst" type="int"> 25000 </data>
- <data name="rmnet_data_enabled" type="int"> 1 </data>
- <data name="dataformat_agg_dl_pkt" type="int"> 10 </data>
- <data name="dataformat_agg_dl_size" type="int"> 8192 </data>
- <data name="dataformat_agg_ul_pkt" type="int"> 0 </data>
- <data name="dataformat_agg_ul_size" type="int"> 0 </data>
- <data name="dataformat_dl_data_aggregation_protocol" type="int"> 8 </data>
- <data name="dataformat_ul_data_aggregation_protocol" type="int"> 8 </data>
- <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
- <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
- <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
-
- <data name="pnd_rps_mask" type="int"> 2 </data>
- <data name="vnd_rps_mask" type="int"> 15 </data>
- <data name="netdev_budget" type="int"> 0 </data>
- <data name="disable_tcp_hystart" type="int"> 1 </data>
- <data name="low_latency_filters" type="int"> 0 </data>
- <data name="qos_via_idl" type="int"> 1 </data>
-
- <data name="num_modems" type="int"> 2 </data>
- <list name="modems_enabled">
- <data type="int"> 1 </data> <!-- MODEM_MSM -->
- <data type="int"> 0 </data> <!-- MODEM_MDM -->
- </list>
-
- <data name="control_ports_len" type="int"> 8 </data>
- <list name="control_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <data name="data_ports_len" type="int"> 8 </data>
- <list name="data_ports">
- <data type="string"> rmnet_data0 </data>
- <data type="string"> rmnet_data1 </data>
- <data type="string"> rmnet_data2 </data>
- <data type="string"> rmnet_data3 </data>
- <data type="string"> rmnet_data4 </data>
- <data type="string"> rmnet_data5 </data>
- <data type="string"> rmnet_data6 </data>
- <data type="string"> rmnet_data7 </data>
- </list>
-
- <!-- iWLAN ports -->
- <data name="iwlan_enable" type="int"> 1 </data>
- <data name="rev_control_ports_len" type="int"> 9 </data>
- <list name="rev_control_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
-
- <data name="rev_data_ports_len" type="int"> 9 </data>
- <list name="rev_data_ports">
- <data type="string"> r_rmnet_data0 </data>
- <data type="string"> r_rmnet_data1 </data>
- <data type="string"> r_rmnet_data2 </data>
- <data type="string"> r_rmnet_data3 </data>
- <data type="string"> r_rmnet_data4 </data>
- <data type="string"> r_rmnet_data5 </data>
- <data type="string"> r_rmnet_data6 </data>
- <data type="string"> r_rmnet_data7 </data>
- <data type="string"> r_rmnet_data8 </data>
- </list>
- </listitem>
-</list>
diff --git a/configs/qmi_config.xml b/configs/qmi_config.xml
deleted file mode 100644
index 4ce764b..0000000
--- a/configs/qmi_config.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- QMI configuration -->
-<list name="qmi_config">
-
- <!-- MSM8994 parameters -->
- <listitem name = "msm8994">
-
- <data name="single_qmux_ch" type="int"> 1 </data>
- <data name="dpm_enabled" type="int"> 1 </data>
- <data name="use_qmuxd" type="int"> 1 </data>
- <data name="control_ports_len" type="int"> 1 </data>
-
- <list name="conn_str">
- <data type="string"> QMI_PORT_RMNET_IPA_0 </data>
- </list>
-
- <list name="conn_id">
- <data type="string"> QMI_CONN_ID_RMNET_0 </data>
- <data type="string"> QMI_CONN_ID_RMNET_8 </data>
- </list>
-
- <list name="dev_name">
- <data type="string"> /dev/smdcntl0 </data>
- <data type="string"> /dev/smdcntl8 </data>
- </list>
-
- <list name="dev_name_test">
- <data type="string"> /tmp/data/smdcntl0 </data>
- <data type="string"> /tmp/data/smdcntl8 </data>
- </list>
-
- <list name="ch_name">
- <data type="string"> DATA5_CNTL </data>
- <data type="string"> DATA14_CNTL </data>
- </list>
-
- <list name="transport">
- <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
- <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
- </list>
-
- <list name="enabled">
- <data type="int"> 1 </data>
- <data type="int"> 1 </data>
- </list>
-
- <list name="open_at_powerup">
- <data type="int"> 1 </data>
- </list>
-
- </listitem>
-
- <!-- MSM8996 parameters -->
- <listitem name = "msm8996">
-
- <data name="single_qmux_ch" type="int"> 1 </data>
- <data name="control_ports_len" type="int"> 2 </data>
- <data name="dpm_enabled" type="int"> 1 </data>
- <data name="use_qmuxd" type="int"> 0 </data>
-
- <list name="conn_str">
- <data type="string"> QMI_PORT_RMNET_0 </data>
- <data type="string"> QMI_PORT_RMNET_8 </data>
- </list>
-
- <list name="conn_id">
- <data type="string"> QMI_CONN_ID_RMNET_0 </data>
- <data type="string"> QMI_CONN_ID_RMNET_8 </data>
- </list>
-
- <list name="dev_name">
- <data type="string"> /dev/smdcntl0 </data>
- <data type="string"> /dev/smdcntl8 </data>
- </list>
-
- <list name="dev_name_test">
- <data type="string"> /tmp/data/smdcntl0 </data>
- <data type="string"> /tmp/data/smdcntl8 </data>
- </list>
-
- <list name="ch_name">
- <data type="string"> DATA5_CNTL </data>
- <data type="string"> DATA40_CNTL </data>
- </list>
-
- <list name="transport">
- <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
- <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
- </list>
-
- <list name="enabled">
- <data type="int"> 1 </data>
- <data type="int"> 1 </data>
- </list>
-
- <list name="open_at_powerup">
- <data type="int"> 1 </data>
- <data type="int"> 0 </data>
- </list>
-
- </listitem>
-
- <!-- MSM8976 parameters -->
- <listitem name = "Eldarion">
-
- <data name="single_qmux_ch" type="int"> 1 </data>
- <data name="dpm_enabled" type="int"> 1 </data>
- <data name="use_qmuxd" type="int"> 1 </data>
- <data name="control_ports_len" type="int"> 2 </data>
-
- <list name="conn_str">
- <data type="string"> QMI_PORT_RMNET_0 </data>
- <data type="string"> QMI_PORT_RMNET_8 </data>
- </list>
-
- <list name="conn_id">
- <data type="string"> QMI_CONN_ID_RMNET_0 </data>
- <data type="string"> QMI_CONN_ID_RMNET_8 </data>
- </list>
-
- <list name="dev_name">
- <data type="string"> /dev/smdcntl0 </data>
- <data type="string"> /dev/smdcntl8 </data>
- </list>
-
- <list name="dev_name_test">
- <data type="string"> /tmp/data/smdcntl0 </data>
- <data type="string"> /tmp/data/smdcntl8 </data>
- </list>
-
- <list name="ch_name">
- <data type="string"> DATA5_CNTL </data>
- <data type="string"> DATA40_CNTL </data>
- </list>
-
- <list name="transport">
- <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
- <data type="string"> LINUX_QMI_TRANSPORT_SMD </data>
- </list>
-
- <list name="enabled">
- <data type="int"> 1 </data>
- <data type="int"> 1 </data>
- </list>
-
- <list name="open_at_powerup">
- <data type="int"> 1 </data>
- <data type="int"> 0 </data>
- </list>
-
- </listitem>
-</list>
-
diff --git a/extract-files.sh b/extract-files.sh
new file mode 100755
index 0000000..5732fa2
--- /dev/null
+++ b/extract-files.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# Copyright (C) 2017-2019 The LineageOS 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.
+#
+
+function blob_fixup() {
+ case "${1}" in
+ lib/hw/camera.vendor.qcom.so)
+ sed -i "s|com.sonyericsson.permission.CAMERA_EXTENDED|android.permission.CAMERA\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0|g" "${2}"
+ ;;
+ lib/libcameralight.so)
+ sed -i "s|/system/etc/flashled_calc_parameters.cfg|/vendor/etc/flashled_calc_parameters.cfg|g" "${2}"
+ ;;
+ vendor/lib/libdsi_netctrl.so)
+ sed -i "s|/system/etc/data/dsi_config.xml|/vendor/etc/data/dsi_config.xml|g" "${2}"
+ ;;
+ vendor/bin/iddd)
+ sed -i "s|/system/etc/iddd.conf|/vendor/etc/iddd.conf|g" "${2}"
+ ;;
+ vendor/bin/netmgrd)
+ sed -i "s|/system/etc/data/netmgr_config.xml|/vendor/etc/data/netmgr_config.xml|g" "${2}"
+ ;;
+ vendor/bin/qmuxd)
+ sed -i "s|/system/etc/data/qmi_config.xml|/vendor/etc/data/qmi_config.xml|g" "${2}"
+ ;;
+ esac
+}
+
+# If we're being sourced by the common script that we called,
+# stop right here. No need to go down the rabbit hole.
+if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+ return
+fi
+
+set -e
+
+export DEVICE_PLATFORM=msm8974-common
+
+"./../../${VENDOR}/${DEVICE_PLATFORM}/extract-files.sh" "$@"
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 8becc76..a25f6d5 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,61 +1,97 @@
+# ADSP
+bin/adsprpcd:vendor/bin/adsprpcd
+vendor/lib/libadsprpc.so
+vendor/lib/libfastcvadsp_stub.so
+vendor/lib/libfastcvopt.so
+
+# Assertive Display
+etc/ad_calib.cfg:vendor/etc/ad_calib.cfg
+
# Audio
vendor/lib/libacdbloader.so
-vendor/lib/libacdbmapper.so
vendor/lib/libacdbrtac.so
vendor/lib/libadiertac.so
vendor/lib/libaudcal.so
-vendor/lib/libaudioalsa.so
vendor/lib/soundfx/libqcbassboost.so
vendor/lib/soundfx/libqcreverb.so
vendor/lib/soundfx/libqcvirt.so
-# ADSP
-bin/adsprpcd
-vendor/lib/libadsprpc.so
-vendor/lib/libfastcvadsp_stub.so
+# Bluetooth aptX - from Motorola Moto Z NCLS25.86-11-4-6-5
+vendor/lib/libaptX_encoder.so|b03772672144d4b750a5672c2922aded93bb0512
+
+# CMN firmware
+etc/firmware/cmnlib.b00:vendor/firmware/cmnlib.b00
+etc/firmware/cmnlib.b01:vendor/firmware/cmnlib.b01
+etc/firmware/cmnlib.b02:vendor/firmware/cmnlib.b02
+etc/firmware/cmnlib.b03:vendor/firmware/cmnlib.b03
+etc/firmware/cmnlib.mdt:vendor/firmware/cmnlib.mdt
+
+# Cacao
+lib/camera/libexcal_cam_ctrl_plugin.so
+lib/camera/libexcal_cap_ctrl_plugin.so
+lib/camera/libexcal_color_ctrl_plugin.so
+lib/camera/libexcal_debug_display_plugin.so
+lib/camera/libexcal_exposure_ctrl_plugin.so
+lib/camera/libexcal_face_detector_plugin.so
+lib/camera/libexcal_flicker_detector_plugin.so
+lib/camera/libexcal_focus_stats_conv_plugin.so
+lib/camera/libexcal_hal_ctrl_plugin.so
+lib/camera/libexcal_hdr_plugin.so
+lib/camera/libexcal_idt_ctrl_plugin.so
+lib/camera/libexcal_image_conv_plugin.so
+lib/camera/libexcal_iq_ctrl_plugin.so
+lib/camera/libexcal_jpeg_enc_plugin.so
+lib/camera/libexcal_lens_ctrl_plugin.so
+lib/camera/libexcal_motion_estimation_plugin.so
+lib/camera/libexcal_multiframe_nr_plugin.so
+lib/camera/libexcal_object_tracker_plugin.so
+lib/camera/libexcal_scene_detector_plugin.so
+lib/camera/libexcal_snapshot_ctrl_plugin.so
+lib/camera/libexcal_splitter_plugin.so
+lib/camera/libexcal_streaming_ctrl_plugin.so
+lib/libcacao_chokoball.so
+lib/libcacao_client.so
+lib/libcacao_common.so
+lib/libcacao_face.so
+lib/libcacao_imageconv.so
+lib/libcacao_imgproc.so
+lib/libcacao_jpeg.so
+lib/libcacao_pal.so
+lib/libcacao_parammgr.so
+lib/libcacao_service.so
+lib/libcacao_system.so
+lib/libcald_client.so
+lib/libcald_pal.so
+lib/libcald_server.so
+lib/libcald_util.so
+lib/libexcal_core.so
+lib/libexcal_system.so
+lib/libsomc_chokoballpal.so
+lib/libsony_chokoballrsc.so
+lib/libsony_chokoball.so
+lib/libsony_face.so
# Camera
-bin/credmgrd|220874582f2c22cfcca380ca2870e1eB9ab366ae
-bin/iddd
-bin/mm-qcamera-daemon
-etc/flashled_calc_parameters.cfg
-etc/iddd.conf
+bin/mm-qcamera-daemon:vendor/bin/mm-qcamera-daemon
+bin/scd:vendor/bin/scd
+bin/sct_service:vendor/bin/sct_service
+etc/flashled_calc_parameters.cfg:vendor/etc/flashled_calc_parameters.cfg
lib/hw/camera.qcom.so:lib/hw/camera.vendor.qcom.so
-lib/lib_get_secure_mode.so
-lib/lib_get_rooting_status.so
lib/libcamera_clientsemc.so
lib/libcameralight.so
lib/libcammw.so
-lib/libcredential-manager-service.so|0a20a83de6be69a8ce1d0ed15f76a1bd3cdcfd31
-lib/libidd.so
-lib/liblights-core.so
-lib/libmmcamera_interface.so
-lib/libmmjpeg_interface.so
-lib/libprotobuf-c.so
-lib/libqomx_core.so
-lib/libsys-utils.so
-vendor/CredentialManagerData
-vendor/lib/libactuator_dw9714.so
-vendor/lib/libactuator_dw9714_camcorder.so
+lib/libmmcamera_interface.so:vendor/lib/libmmcamera_interface.so
+lib/libmmjpeg_interface.so:vendor/lib/libmmjpeg_interface.so
+lib/libqomx_core.so:vendor/lib/libqomx_core.so
+vendor/camera/flash.dat
+vendor/camera/jpeg_fsc.dat
vendor/lib/libactuator_dw9714_camera.so
-vendor/lib/libactuator_dw9716.so
-vendor/lib/libactuator_dw9716_camcorder.so
vendor/lib/libactuator_dw9716_camera.so
-vendor/lib/libactuator_iu074.so
-vendor/lib/libactuator_iu074_camcorder.so
vendor/lib/libactuator_iu074_camera.so
-vendor/lib/libactuator_ov8825.so
-vendor/lib/libactuator_ov8825_camcorder.so
-vendor/lib/libactuator_ov8825_camera.so
-vendor/lib/libactuator_ov12830.so
-vendor/lib/libactuator_ov12830_camcorder.so
vendor/lib/libactuator_ov12830_camera.so
-vendor/lib/libactuator_rohm_bu64243gwz.so
-vendor/lib/libactuator_rohm_bu64243gwz_camcorder.so
+vendor/lib/libactuator_ov8825_camera.so
vendor/lib/libactuator_rohm_bu64243gwz_camera.so
vendor/lib/libfastcvopt.so
-vendor/lib/libjpegdhw.so
-vendor/lib/libjpegehw.so
vendor/lib/libmmcamera2_c2d_module.so
vendor/lib/libmmcamera2_cpp_module.so
vendor/lib/libmmcamera2_frame_algorithm.so
@@ -73,66 +109,11 @@ vendor/lib/libmmcamera_faceproc.so
vendor/lib/libmmcamera_hdr_gb_lib.so
vendor/lib/libmmcamera_hdr_lib.so
vendor/lib/libmmcamera_imglib.so
-vendor/lib/libmmcamera_ofilm_oty5f03_eeprom.so
-vendor/lib/libmmcamera_sunny_p12v01m_eeprom.so
-vendor/lib/libmmcamera_sunny_p5v23c_eeprom.so
-vendor/lib/libmmcamera_sunny_q8v18a_eeprom.so
vendor/lib/libmmcamera_tintless_algo.so
vendor/lib/libmmcamera_tintless_bg_pca_algo.so
vendor/lib/libmmcamera_truly_cm7700_eeprom.so
vendor/lib/libmmcamera_wavelet_lib.so
-vendor/lib/libmmjpeg.so
-vendor/lib/libmmqjpeg_codec.so
vendor/lib/liboemcamera.so
-vendor/lib/libqomx_jpegdec.so
-vendor/lib/libqomx_jpegenc.so
-vendor/camera/flash.dat
-vendor/camera/jpeg_fsc.dat
-
-# Cacao
-lib/camera/libexcal_object_tracker_plugin.so
-lib/camera/libexcal_cam_ctrl_plugin.so
-lib/camera/libexcal_scene_detector_plugin.so
-lib/camera/libexcal_streaming_ctrl_plugin.so
-lib/camera/libexcal_idt_ctrl_plugin.so
-lib/camera/libexcal_hdr_plugin.so
-lib/camera/libexcal_splitter_plugin.so
-lib/camera/libexcal_color_ctrl_plugin.so
-lib/camera/libexcal_snapshot_ctrl_plugin.so
-lib/camera/libexcal_hal_ctrl_plugin.so
-lib/camera/libexcal_face_detector_plugin.so
-lib/camera/libexcal_debug_display_plugin.so
-lib/camera/libexcal_lens_ctrl_plugin.so
-lib/camera/libexcal_focus_stats_conv_plugin.so
-lib/camera/libexcal_image_conv_plugin.so
-lib/camera/libexcal_flicker_detector_plugin.so
-lib/camera/libexcal_multiframe_nr_plugin.so
-lib/camera/libexcal_jpeg_enc_plugin.so
-lib/camera/libexcal_cap_ctrl_plugin.so
-lib/camera/libexcal_motion_estimation_plugin.so
-lib/camera/libexcal_iq_ctrl_plugin.so
-lib/camera/libexcal_exposure_ctrl_plugin.so
-lib/libcacao_chokoball.so
-lib/libcacao_client.so
-lib/libcacao_common.so
-lib/libcacao_face.so
-lib/libcacao_imageconv.so
-lib/libcacao_imgproc.so
-lib/libcacao_jpeg.so
-lib/libcacao_pal.so
-lib/libcacao_parammgr.so
-lib/libcacao_service.so
-lib/libcacao_system.so
-lib/libcald_client.so
-lib/libcald_pal.so
-lib/libcald_server.so
-lib/libcald_util.so
-lib/libexcal_core.so
-lib/libexcal_system.so
-lib/libsomc_chokoballpal.so
-lib/libsony_chokoball.so
-lib/libsony_chokoballrsc.so
-lib/libsony_face.so
# Chromatix
vendor/lib/libchromatix_imx132_common.so
@@ -236,117 +217,105 @@ vendor/lib/libchromatix_skuf_ov5648_p5v23c_preview.so
vendor/lib/libchromatix_skuf_ov5648_p5v23c_snapshot.so
# Camera firmware
-etc/firmware/cpp_firmware_v1_1_1.fw
-etc/firmware/cpp_firmware_v1_1_6.fw
etc/firmware/cpp_firmware_v1_2_0.fw
-etc/firmware/venus.b00
-etc/firmware/venus.b01
-etc/firmware/venus.b02
-etc/firmware/venus.b03
-etc/firmware/venus.b04
-etc/firmware/venus.mbn
-etc/firmware/venus.mdt
+
+# Credential manager
+bin/credmgrd:vendor/bin/credmgrd|220874582f2c22cfcca380ca2870e1eB9ab366ae
+bin/suntrold:vendor/bin/suntrold
+lib/lib_asb_tee.so
+lib/libcredential-manager-service.so|0a20a83de6be69a8ce1d0ed15f76a1bd3cdcfd31
+lib/lib_get_secure_mode.so
+lib/libkeyctrl.so
+lib/libprotobuf-c.so
+vendor/CredentialManagerData|94ec2de302937f545ab0b8a221f73d1fcfa84916
# DRM
-bin/qseecomd
-vendor/lib/libdrmdiag.so
+bin/qseecomd:vendor/bin/qseecomd
vendor/lib/libdrmfs.so
vendor/lib/libdrmtime.so
vendor/lib/libQSEEComAPI.so
vendor/lib/librpmb.so
vendor/lib/libssd.so
-vendor/lib/libtzdrmgenprov.so
-
-# GPS
-bin/loc_launcher
-lib/hw/gps.default.so
-lib/libgps.utils.so
-lib/libloc_api_v02.so
-lib/libloc_core.so
-lib/libloc_eng.so
-vendor/lib/hw/flp.default.so
-vendor/lib/libflp.so
-vendor/lib/libgeofence.so
-vendor/lib/libizat_core.so
-vendor/lib/liblbs_core.so
-vendor/lib/libloc_ext.so
-vendor/lib/libloc_xtra.so
-vendor/lib/libquipc_os_api.so
-# IRSC
-bin/irsc_util
+# In Device Diagnostics (idd)
+bin/iddd:vendor/bin/iddd
+etc/iddd.conf:vendor/etc/iddd.conf
+lib/libidd.so:vendor/lib/libidd.so
-# Keystore
+# Keymaster firmware
vendor/firmware/keymaster/keymaster.b00
vendor/firmware/keymaster/keymaster.b01
vendor/firmware/keymaster/keymaster.b02
vendor/firmware/keymaster/keymaster.b03
vendor/firmware/keymaster/keymaster.mdt
-# Modem
-bin/netmgrd
-bin/qmuxd
-bin/rmt_storage
-lib/libmdmdetect.so
-lib/libpin-cache.so
-lib/libstartup-reason.so
-vendor/lib/libconnctrl.so
-vendor/lib/libcneapiclient.so
-vendor/lib/libconfigdb.so
-vendor/lib/libdiag.so
-vendor/lib/libdsi_netctrl.so
-vendor/lib/libdsutils.so
-vendor/lib/libidl.so
-vendor/lib/liblqe.so
-vendor/lib/libnetmgr.so
-vendor/lib/libperipheral_client.so
-vendor/lib/libril-qc-qmi-1.so
-vendor/lib/libril-qc-radioconfig.so
-vendor/lib/libsmemlog.so
-vendor/lib/libsystem_health_mon.so
-vendor/lib/libxml.so
-vendor/lib/libxtadapter.so
-vendor/lib/libwqe.so
+# Media
+vendor/lib/libOmxAacDec.so
+vendor/lib/libOmxAmrwbplusDec.so
+vendor/lib/libOmxEvrcDec.so
+vendor/lib/libOmxQcelp13Dec.so
+vendor/lib/libOmxWmaDec.so
-# Misc Firmware
-etc/firmware/leia_pfp_470.fw
-etc/firmware/leia_pm4_470.fw
+# NFC
+vendor/firmware/libpn547_fw.so:vendor/lib/libpn547_fw.so
+vendor/lib/hw/android.hardware.nfc@1.0-impl.so|d3ce6c813c5fab36ddf2d9a933cf6a3da7905382
+vendor/lib/hw/nfc_nci.pn54x.default.so|9175a9714b3e9e27401ea8f51157e5947bb216f3
-# Playready
-etc/firmware/cmnlib.b00
-etc/firmware/cmnlib.b01
-etc/firmware/cmnlib.b02
-etc/firmware/cmnlib.b03
-etc/firmware/cmnlib.mdt
+# Perf
+vendor/lib/libqc-opt.so
-# QMI
-vendor/lib/libqcci_legacy.so
-vendor/lib/libqdi.so
-vendor/lib/libqdp.so
-vendor/lib/libqmi_cci.so
-vendor/lib/libqmi_client_helper.so
-vendor/lib/libqmi_client_qmux.so
-vendor/lib/libqmi_common_so.so
-vendor/lib/libqmi_csi.so
-vendor/lib/libqmi_encdec.so
-vendor/lib/libqmiservices.so
-vendor/lib/libqmi.so
+# Qualcomm framework - from Xperia AOSP M-MR1 v13 legacy
+vendor/bin/irsc_util|a0e8e2197aacaefcf98b6683813faf29e80b59f9
+vendor/lib/libdiag.so|f9fa0da3765ee4a2fa6d5db6f61533a18aece10b
+vendor/lib/libdsi_netctrl.so|74a7e0fc3e68a5386da0b6a5c38c80a34a98d530|9e711c3e7122b9745e406fcbc65f24da48f2969d
+vendor/lib/libdsutils.so|421701b34d49e73f6c80b6cc38c6019b0c46ec40
+vendor/lib/libidl.so|d11d82fa9234081aefa76aaddc38d557cc95791f
+vendor/lib/libqcci_legacy.so|83cabc8c9d7945cbc63561e7974e30f5f9f7e635
+vendor/lib/libqdi.so|8710587f553672024750e2f23fdab4b17552d771
+vendor/lib/libqdp.so|49a30545f0db0e0175e9be2f42667b7d1baa1bca
+vendor/lib/libqmi_cci.so|540e0ff1627c5b98629ff0654453e87c36e1c039
+vendor/lib/libqmi_client_helper.so|26600b37463d7c25b9331333c1938f9c806e49d8
+vendor/lib/libqmi_client_qmux.so|024934bf845fed73703c7a9a8ba8554cad756260
+vendor/lib/libqmi_common_so.so|a14f7c2cad475b08b7fd8683b7ae02a151ef8fe6
+vendor/lib/libqmi_csi.so|266967783e9d432fa55cb3771bfcf837f5e77296
+vendor/lib/libqmi_encdec.so|4d55f0ea75c282d7bb91f61ef779019b2e6f89bc
+vendor/lib/libqmiservices.so|0aebb2765786fa7ba3a36d8b5feec92c990879e5
+vendor/lib/libqmi.so|a4107711bf03e5b8be2049422e3546967f229d92
+vendor/lib/libsmemlog.so|e4dd61a1d9b1c41eaebdc4eab809362dc156db54
+vendor/lib/libsystem_health_mon.so|2beb793d35d097db64254d19dd1bcc1e11da9a27
-# Security
-lib/lib_asb_tee.so
-lib/libkeyctrl.so
+# QuickCharge 2.0
+bin/hvdcp:vendor/bin/hvdcp
+
+# Radio config
+etc/data/dsi_config.xml:vendor/etc/data/dsi_config.xml
+etc/data/netmgr_config.xml:vendor/etc/data/netmgr_config.xml
+etc/data/qmi_config.xml:vendor/etc/data/qmi_config.xml
+
+# Radio - from Xperia AOSP M-MR1 v13 legacy
+vendor/bin/netmgrd|0cba1f2685ed868331a974332e3dd8411e1f7008|26aed010ce431b01f427f88466f02d16f53bdf12
+vendor/bin/qmuxd|1f2f06e0aa4eb3ba1e15384538c0c76fa89d9d21|3de892962e863231f1c2c937d39299126a8e4c51
+vendor/bin/rmt_storage|2dfc2543f5f76e1e4b5761f21813bbd023ee4ad0
+vendor/lib/libconfigdb.so|f36d649ddd3531bb6a51d00a598e04df265947e8
+vendor/lib/liblqe.so|7b8ff5471b737cdf49505ae0e6cd7dd2c6a35023
+vendor/lib/libmdmdetect.so|ad101a2bf081a640a1c35f7da03ab25bb20599be
+vendor/lib/libnetmgr.so|c028279bd15e4755bf444522a19572a56f1b01ac
+vendor/lib/libperipheral_client.so|031007d4688445d69bca6ec11d799f95b24d917c
+vendor/lib/libril-qc-qmi-1.so|3e310ae6fdab47e5bc3080046f2d75eba022d461
+vendor/lib/libril-qcril-hook-oem.so|cd685fd7590ab1641fc90ef9b15dc0e0382781c0
+vendor/lib/libxml.so|4dfdc946c5a72f63069bcbcdbe1bd7b4dd4bcc48
# Security firmware
+etc/firmware/tzhdcp.b00
+etc/firmware/tzhdcp.b01
+etc/firmware/tzhdcp.b02
+etc/firmware/tzhdcp.b03
+etc/firmware/tzhdcp.mdt
etc/firmware/tzlibasb.b00
etc/firmware/tzlibasb.b01
etc/firmware/tzlibasb.b02
etc/firmware/tzlibasb.b03
etc/firmware/tzlibasb.mdt
-etc/firmware/tznautilus.b00
-etc/firmware/tznautilus.b01
-etc/firmware/tznautilus.b02
-etc/firmware/tznautilus.b03
-etc/firmware/tznautilus.mdt
etc/firmware/tzsuntory.b00
etc/firmware/tzsuntory.b01
etc/firmware/tzsuntory.b02
@@ -354,49 +323,32 @@ etc/firmware/tzsuntory.b03
etc/firmware/tzsuntory.mdt
# Sensors
-bin/sensors.qcom
+bin/sensors.qcom:vendor/bin/sensors.qcom
vendor/lib/hw/activity_recognition.msm8974.so
vendor/lib/hw/sensors.msm8974.so
vendor/lib/libsensor1.so
vendor/lib/libsensor_reg.so
# TA
-bin/taimport
-bin/ta_qmi_service
-bin/mlog_qmi_service
-bin/updatemiscta
-lib/libMiscTaAccessor.so
-lib/libmiscta.so
--lib/libta.so
-lib/lib_extended_boot_lock.so
-lib/lib_get_hwc_revision.so
-lib/lib_get_s1_cert_common_name.so
-lib/libMiscTAApi.so
-lib/lib_s1_verification.so
-lib/lib_uncontrolled_rooting_status.so
+bin/mlog_qmi_service:vendor/bin/mlog_qmi_service
+bin/taimport:vendor/bin/taimport
+bin/ta_qmi_service:vendor/bin/ta_qmi_service
+bin/updatemiscta:vendor/bin/updatemiscta
+lib/libmiscta.so:vendor/lib/libmiscta.so
+-lib/libta.so:vendor/lib/libta.so
-# Time
-bin/time_daemon
--app/TimeService/TimeService.apk
+# Time services
-vendor/lib/libtime_genoff.so
--vendor/lib/libTimeService.so
-
-# Widevine firmware
-etc/firmware/tzwidevine.b00
-etc/firmware/tzwidevine.b01
-etc/firmware/tzwidevine.b02
-etc/firmware/tzwidevine.b03
-etc/firmware/tzwidevine.mdt
-# Perf
-vendor/lib/libqc-opt.so
-
-# NFC
-vendor/firmware/libpn547_fw.so
+# Venus (media) firmware
+etc/firmware/venus.b00:vendor/firmware/venus.b00
+etc/firmware/venus.b01:vendor/firmware/venus.b01
+etc/firmware/venus.b02:vendor/firmware/venus.b02
+etc/firmware/venus.b03:vendor/firmware/venus.b03
+etc/firmware/venus.b04:vendor/firmware/venus.b04
+etc/firmware/venus.mbn:vendor/firmware/venus.mbn
+etc/firmware/venus.mdt:vendor/firmware/venus.mdt
-# Misc
-bin/scd
-bin/sct_service
-bin/suntrold
-lib/libscdclient.so
-vendor/lib/liboemcrypto.so \ No newline at end of file
+# Wifi firmware
+etc/firmware/wlan/bcmdhd/fw_bcmdhd_apsta.bin:vendor/firmware/fw_bcmdhd_apsta.bin
+etc/firmware/wlan/bcmdhd/fw_bcmdhd.bin:vendor/firmware/fw_bcmdhd.bin
diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc
index 6487b36..eb1092c 100644
--- a/rootdir/init.camera.rc
+++ b/rootdir/init.camera.rc
@@ -10,7 +10,7 @@
# 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
+# See the License for the specific language governing permissions and
# limitations under the License.
#
@@ -101,14 +101,14 @@ service credmgrd /system/vendor/bin/credmgrd
service sct_service /system/vendor/bin/sct_service
user root
disabled
-
+
# Trim Area QMI service
service ta_qmi_service /system/vendor/bin/ta_qmi_service
user system
group system root net_raw wakelock
disabled
-service scd /system/bin/scd
+service scd /system/vendor/bin/scd
class late_start
user system
group system
@@ -141,7 +141,7 @@ service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16
user system
group system root camera media
socket tad stream 0770 system system
-
+
# tad_static is in rootfs, normal file_context does not work
seclabel u:r:tad:s0
@@ -150,4 +150,3 @@ service updatemiscta /system/vendor/bin/updatemiscta
user system
group system
oneshot
-
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
new file mode 100755
index 0000000..5f107df
--- /dev/null
+++ b/setup-makefiles.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright (C) 2017-2019 The LineageOS 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.
+#
+
+export DEVICE_PLATFORM_BARRIER="castor castor_windy sirius z3 z3c z3dual"
+
+# If we're being sourced by the common script that we called,
+# stop right here. No need to go down the rabbit hole.
+if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
+ return
+fi
+
+set -e
+
+export DEVICE_PLATFORM="msm8974-common"
+
+"./../../${VENDOR}/${DEVICE_PLATFORM}/setup-makefiles.sh" "$@"
diff --git a/shinano.mk b/shinano.mk
index 32bae46..9ccd938 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -77,20 +77,10 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
tfa9890_amp
-# Assertive Display
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/ad_calib.cfg:system/etc/ad_calib.cfg
-
# Bluetooth
PRODUCT_PACKAGES += \
libbt-vendor
-# RIL
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/netmgr_config.xml:system/etc/data/netmgr_config.xml \
- $(LOCAL_PATH)/configs/dsi_config.xml:system/etc/data/dsi_config.xml \
- $(LOCAL_PATH)/configs/qmi_config.xml:system/etc/data/qmi_config.xml
-
# Media profile
PRODUCT_COPY_FILES += \
$(COMMON_PATH)/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
@@ -175,5 +165,5 @@ PRODUCT_COPY_FILES += \
# BCM Wifi
$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/device-bcm.mk)
-# Include non-opensource parts
+# Call the proprietary setup
$(call inherit-product, vendor/sony/shinano-common/shinano-common-vendor.mk)
diff --git a/system_prop.mk b/system_prop.mk
index 45b70e5..9fe7ee1 100644
--- a/system_prop.mk
+++ b/system_prop.mk
@@ -39,7 +39,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Assertive Display
PRODUCT_PROPERTY_OVERRIDES += \
ro.qcom.ad=1 \
- ro.qcom.ad.calib.data=/system/etc/ad_calib.cfg
+ ro.qcom.ad.calib.data=/system/vendor/etc/ad_calib.cfg
# Audio HAL
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/tfa9890/tfa9890.h b/tfa9890/tfa9890.h
index f9f042e..c01e32a 100644
--- a/tfa9890/tfa9890.h
+++ b/tfa9890/tfa9890.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014, The CyanogenMod Project
+ * Copyright (C) 2014-2016 The CyanogenMod Project
+ * Copyright (C) 2017-2019 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,40 +20,40 @@
#define TFA9890_DEVICE "/dev/tfa98xx"
-/* All the files in /system/etc/tfa98xx */
-#define PATCH_DSP_FILE "/system/etc/tfa98xx/TFA9890.patch"
-#define PATCH_COLDBOOT_FILE "/system/etc/tfa98xx/coldboot.patch"
+/* All the files in /vendor/etc/tfa98xx */
+#define PATCH_DSP_FILE "/vendor/etc/tfa98xx/TFA9890.patch"
+#define PATCH_COLDBOOT_FILE "/vendor/etc/tfa98xx/coldboot.patch"
-#define CONFIG_TOP "/system/etc/tfa98xx/TFA9890_top.config"
-#define CONFIG_BOTTOM "/system/etc/tfa98xx/TFA9890_btm.config"
-#define CONFIG_RECEIVER "/system/etc/tfa98xx/TFA9890_Receiver.config"
+#define CONFIG_TOP "/vendor/etc/tfa98xx/TFA9890_top.config"
+#define CONFIG_BOTTOM "/vendor/etc/tfa98xx/TFA9890_btm.config"
+#define CONFIG_RECEIVER "/vendor/etc/tfa98xx/TFA9890_Receiver.config"
-#define SPEAKER_TOP "/system/etc/tfa98xx/top.speaker"
-#define SPEAKER_BOTTOM "/system/etc/tfa98xx/btm.speaker"
+#define SPEAKER_TOP "/vendor/etc/tfa98xx/top.speaker"
+#define SPEAKER_BOTTOM "/vendor/etc/tfa98xx/btm.speaker"
-#define PRESET_HIFISPEAKER_TOP "/system/etc/tfa98xx/HiFiSpeaker_top.preset"
-#define PRESET_HIFISPEAKER_BOTTOM "/system/etc/tfa98xx/HiFiSpeaker_btm.preset"
-#define PRESET_HIFISPEAKER_RING_TOP "/system/etc/tfa98xx/HiFiSpeakerRing_top.preset"
-#define PRESET_HIFISPEAKER_RING_BOTTOM "/system/etc/tfa98xx/HiFiSpeakerRing_btm.preset"
-#define PRESET_HIFISPEAKER_SFORCE_TOP "/system/etc/tfa98xx/HiFiSpeakerSforce_top.preset"
-#define PRESET_HIFISPEAKER_SFORCE_BOTTOM "/system/etc/tfa98xx/HiFiSpeakerSforce_btm.preset"
-#define PRESET_VOICECALLSPEAKER_TOP "/system/etc/tfa98xx/VoiceCallSpeaker_top.preset"
-#define PRESET_VOICECALLSPEAKER_BOTTOM "/system/etc/tfa98xx/VoiceCallSpeaker_btm.preset"
-#define PRESET_FMSPEAKER_TOP "/system/etc/tfa98xx/FMSpeaker_top.preset"
-#define PRESET_FMSPEAKER_BOTTOM "/system/etc/tfa98xx/FMSpeaker_btm.preset"
-#define PRESET_VOICECALLEARPICE_TOP "/system/etc/tfa98xx/VoiceCallEarpice_top.preset"
+#define PRESET_HIFISPEAKER_TOP "/vendor/etc/tfa98xx/HiFiSpeaker_top.preset"
+#define PRESET_HIFISPEAKER_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeaker_btm.preset"
+#define PRESET_HIFISPEAKER_RING_TOP "/vendor/etc/tfa98xx/HiFiSpeakerRing_top.preset"
+#define PRESET_HIFISPEAKER_RING_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeakerRing_btm.preset"
+#define PRESET_HIFISPEAKER_SFORCE_TOP "/vendor/etc/tfa98xx/HiFiSpeakerSforce_top.preset"
+#define PRESET_HIFISPEAKER_SFORCE_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeakerSforce_btm.preset"
+#define PRESET_VOICECALLSPEAKER_TOP "/vendor/etc/tfa98xx/VoiceCallSpeaker_top.preset"
+#define PRESET_VOICECALLSPEAKER_BOTTOM "/vendor/etc/tfa98xx/VoiceCallSpeaker_btm.preset"
+#define PRESET_FMSPEAKER_TOP "/vendor/etc/tfa98xx/FMSpeaker_top.preset"
+#define PRESET_FMSPEAKER_BOTTOM "/vendor/etc/tfa98xx/FMSpeaker_btm.preset"
+#define PRESET_VOICECALLEARPICE_TOP "/vendor/etc/tfa98xx/VoiceCallEarpice_top.preset"
-#define EQ_HIFISPEAKER_TOP "/system/etc/tfa98xx/HiFiSpeaker_top.eq"
-#define EQ_HIFISPEAKER_BOTTOM "/system/etc/tfa98xx/HiFiSpeaker_btm.eq"
-#define EQ_HIFISPEAKER_RING_TOP "/system/etc/tfa98xx/HiFiSpeakerRing_top.eq"
-#define EQ_HIFISPEAKER_RING_BOTTOM "/system/etc/tfa98xx/HiFiSpeakerRing_btm.eq"
-#define EQ_HIFISPEAKER_SFORCE_TOP "/system/etc/tfa98xx/HiFiSpeakerSforce_top.eq"
-#define EQ_HIFISPEAKER_SFORCE_BOTTOM "/system/etc/tfa98xx/HiFiSpeakerSforce_btm.eq"
-#define EQ_VOICECALLSPEAKER_TOP "/system/etc/tfa98xx/VoiceCallSpeaker_top.eq"
-#define EQ_VOICECALLSPEAKER_BOTTOM "/system/etc/tfa98xx/VoiceCallSpeaker_btm.eq"
-#define EQ_FMSPEAKER_TOP "/system/etc/tfa98xx/FMSpeaker_top.eq"
-#define EQ_FMSPEAKER_BOTTOM "/system/etc/tfa98xx/FMSpeaker_btm.eq"
-#define EQ_VOICECALLEARPICE_TOP "/system/etc/tfa98xx/VoiceCallEarpice_top.eq"
+#define EQ_HIFISPEAKER_TOP "/vendor/etc/tfa98xx/HiFiSpeaker_top.eq"
+#define EQ_HIFISPEAKER_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeaker_btm.eq"
+#define EQ_HIFISPEAKER_RING_TOP "/vendor/etc/tfa98xx/HiFiSpeakerRing_top.eq"
+#define EQ_HIFISPEAKER_RING_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeakerRing_btm.eq"
+#define EQ_HIFISPEAKER_SFORCE_TOP "/vendor/etc/tfa98xx/HiFiSpeakerSforce_top.eq"
+#define EQ_HIFISPEAKER_SFORCE_BOTTOM "/vendor/etc/tfa98xx/HiFiSpeakerSforce_btm.eq"
+#define EQ_VOICECALLSPEAKER_TOP "/vendor/etc/tfa98xx/VoiceCallSpeaker_top.eq"
+#define EQ_VOICECALLSPEAKER_BOTTOM "/vendor/etc/tfa98xx/VoiceCallSpeaker_btm.eq"
+#define EQ_FMSPEAKER_TOP "/vendor/etc/tfa98xx/FMSpeaker_top.eq"
+#define EQ_FMSPEAKER_BOTTOM "/vendor/etc/tfa98xx/FMSpeaker_btm.eq"
+#define EQ_VOICECALLEARPICE_TOP "/vendor/etc/tfa98xx/VoiceCallEarpice_top.eq"
/* Macros for ioctl with above files
* This macro calls tfa9890_prepare_for_ioctl()