Rebase d803 to be in line with other d80x deviceslp5.0

Change-Id: Ib28c1fe7c9ae4566b8ce40ea1b1d6c0a6cb0ffc4

9 files changed, 277 insertions, 347 deletions

diff --git a/configs/gps.conf b/configs/gps.conf
index c159dee..3fce173 100644
--- a/configs/gps.conf
+++ b/configs/gps.conf
@@ -1,8 +1,8 @@
 #Uncommenting these urls would only enable
 #the power up auto injection and force injection(test case).
-XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin
-XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin
-XTRA_SERVER_3=http://xtrapath2.izatcloud.net/xtra2.bin
+XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra2.bin
+XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra2.bin
+XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra2.bin
 
 # Error Estimate
 # _SET = 1
@@ -14,9 +14,9 @@ ERR_ESTIMATE=0
 #Asia
 # NTP_SERVER=asia.pool.ntp.org
 #Europe
-# NTP_SERVER=europe.pool.ntp.org
+NTP_SERVER=europe.pool.ntp.org
 #North America
-NTP_SERVER=north-america.pool.ntp.org
+# NTP_SERVER=north-america.pool.ntp.org
 #Korea
 # NTP_SERVER=0.kr.pool.ntp.org
 #JP
@@ -25,7 +25,7 @@ NTP_SERVER=north-america.pool.ntp.org
 # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info
 #               4 - Debug, 5 - Verbose
 # If DEBUG_LEVEL is commented, Android's logging levels will be used
-DEBUG_LEVEL = 3
+DEBUG_LEVEL = 2
 
 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
@@ -42,7 +42,7 @@ SUPL_VER=0x10000
 # ON_DEMAND_TIME = 0x10
 # GEOFENCE = 0x20
 # default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE
-CAPABILITIES=0x37
+CAPABILITIES=0x17
 
 # Accuracy threshold for intermediate positions
 # less accurate positions are ignored, 0 for passing all positions
@@ -75,6 +75,9 @@ LPP_PROFILE = 0
 ################################
 # EXTRA SETTINGS
 ################################
+# Enable or Disable Wiper (1=Enable, 0=Disable)
+#ENABLE_WIPER=1
+ENABLE_WIPER=0
 # NMEA provider (1=Modem Processor, 0=Application Processor)
 #NMEA_PROVIDER=0
 NMEA_PROVIDER=1
@@ -90,6 +93,6 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0
 ################################
 # LGE EXTRA SETTINGS
 ################################
-VENDOR=RGS
+VENDOR=OPEN
 LGE_TLS_MODE=0
-LGE_GPS_POSITION_MODE=0
+LGE_GPS_POSITION_MODE=1
diff --git a/device.mk b/device.mk
index f9106ec..961a177 100644
--- a/device.mk
+++ b/device.mk
@@ -26,15 +26,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.telephony.default_network=9
 
 PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
+	frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
+	frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml
 
 # NFC packages
 PRODUCT_PACKAGES += \
-    nfc_nci.bcm2079x.default
-
-# NFC config
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf
+    nfc_nci.bcm2079x.default \
+    NfcNci
 
 # GPS
 PRODUCT_COPY_FILES += \
diff --git a/extract-files.sh b/extract-files.sh
index 80b29b3..6e63ed3 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -6,7 +6,7 @@ DEVICE=d802
 BASE=../../../vendor/$VENDOR/$DEVICE/proprietary
 rm -rf $BASE/*
 
-for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$ `; do
+for FILE in `cat proprietary-blobs.txt | grep -v ^# | grep -v ^$ `; do
     DIR=`dirname $FILE`
     if [ ! -d $BASE/$DIR ]; then
         mkdir -p $BASE/$DIR
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
deleted file mode 100755
index 6f2a7c1..0000000
--- a/nfc/libnfc-brcm.conf
+++ /dev/null
@@ -1,257 +0,0 @@
-###################### Start of libnfc-brcm-common.conf #######################
-
-###############################################################################
-# Application options
-APPL_TRACE_LEVEL=0x01
-PROTOCOL_TRACE_LEVEL=0x00000000
-
-###############################################################################
-# performance measurement
-# Change this setting to control how often USERIAL log the performance (throughput)
-# data on read/write/poll
-# defailt is to log performance dara for every 100 read or write
-#REPORT_PERFORMANCE_MEASURE=100
-
-###############################################################################
-# File used for NFA storage
-NFA_STORAGE="/data/nfc"
-
-###############################################################################
-# Insert a delay in milliseconds after NFC_WAKE and before write to NFCC
-NFC_WAKE_DELAY=20
-
-###############################################################################
-# Various Delay settings (in ms) used in USERIAL
-#  POWER_ON_DELAY
-#    Delay after turning on chip, before writing to transport (default 300)
-#  PRE_POWER_OFF_DELAY
-#    Delay after deasserting NFC-Wake before turn off chip (default 0)
-#  POST_POWER_OFF_DELAY
-#    Delay after turning off chip, before USERIAL_close returns (default 0)
-#
-POWER_ON_DELAY=0
-PRE_POWER_OFF_DELAY=10
-#POST_POWER_OFF_DELAY=0
-
-###############################################################################
-# Maximum time (ms) to wait for RESET NTF after setting REG_PU to high
-# The default is 1000.
-NFCC_ENABLE_TIMEOUT=1000
-
-###############################################################################
-# Device Manager Config
-#
-#  If NFA_DM_CFG is not provided, stack default settings are
-#  used (see nfa_dm_cfg.c).  They are as follows:
-#       0 (FALSE)     Automatic NDEF detection when background polling
-#       0 (FALSE)     Automatic NDEF read when background polling
-#
-#NFA_DM_CFG={00:00}
-
-###############################################################################
-# Default poll duration (in ms)
-#  The defualt is 500ms if not set (see nfc_target.h)
-#NFA_DM_DISC_DURATION_POLL=500
-
-###############################################################################
-# Startup Vendor Specific Configuration (100 bytes maximum);
-#  byte[0] TLV total len = 0x5
-#  byte[1] NCI_MTS_CMD|NCI_GID_PROP = 0x2f
-#  byte[2] NCI_MSG_FRAME_LOG = 0x9
-#  byte[3] 2
-#  byte[4] 0=turn off RF frame logging; 1=turn on
-#  byte[5] 0=turn off SWP frame logging; 1=turn on
-#  NFA_DM_START_UP_VSC_CFG={05:2F:09:02:01:01}
-
-###############################################################################
-# Configure the default Destination Gate used by HCI (the default is 4, which
-# is the ETSI loopback gate.
-#NFA_HCI_DEFAULT_DEST_GATE=0x04
-
-###############################################################################
-# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h.
-# The value is set to 3 by default as it assumes we will discover 0xF2,
-# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced
-# so that the stack will not wait any longer than necessary.
-#
-# Use for Host based CE
-NFA_MAX_EE_SUPPORTED=0
-
-# Use for UICC support
-# NFA_MAX_EE_SUPPORTED=3
-
-###############################################################################
-# Configure the single default SE to use.  The default is to use the first
-# SE that is detected by the stack.  This value might be used when the phone
-# supports multiple SE (e.g. 0xF3 and 0xF4) but you want to force it to use
-# one of them (e.g. 0xF4).  This can be set to 0 if there are no SE on the
-# system in order to skip SE initialization.
-#
-# Use for Host based CE
-ACTIVE_SE=0x0
-
-# Use for UICC support
-#ACTIVE_SE=0xF3
-
-###############################################################################
-# Configure the NFC Extras to open and use a static pipe.  If the value is
-# not set or set to 0, then the default is use a dynamic pipe based on a
-# destination gate (see NFA_HCI_DEFAULT_DEST_GATE).  Note there is a value
-# for each UICC (where F3="UICC0" and F4="UICC1")
-#NFA_HCI_STATIC_PIPE_ID_F3=0x70
-NFA_HCI_STATIC_PIPE_ID_F4=0x71
-
-###############################################################################
-# When disconnecting from Oberthur secure element, perform a warm-reset of
-# the secure element to deselect the applet.
-# The default hex value of the command is 0x3.  If this variable is undefined,
-# then this feature is not used.
-OBERTHUR_WARM_RESET_COMMAND=0x03
-
-###############################################################################
-# Force UICC to only listen to the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B.
-#UICC_LISTEN_TECH_MASK=0x01
-
-###############################################################################
-# AID for Empty Select command
-# If specified, this AID will be substituted when an Empty SELECT command is
-# detected.  The first byte is the length of the AID.  Maximum length is 16.
-AID_FOR_EMPTY_SELECT={08:A0:00:00:01:51:00:00:00}
-
-###############################################################################
-# Force tag polling for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B |
-#            NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 |
-#            NFA_TECHNOLOGY_MASK_B_PRIME | NFA_TECHNOLOGY_MASK_A_ACTIVE |
-#            NFA_TECHNOLOGY_MASK_F_ACTIVE.
-#
-# Notable bits:
-#   NFA_TECHNOLOGY_MASK_KOVIO	    0x20
-#   NFA_TECHNOLOGY_MASK_A_ACTIVE    0x40
-#   NFA_TECHNOLOGY_MASK_F_ACTIVE    0x80
-POLLING_TECH_MASK=0xFF
-
-###############################################################################
-# Force P2P to only listen for the following technology(s).
-# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h.
-# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F |
-#            NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE
-#P2P_LISTEN_TECH_MASK=0xC5
-
-###############################################################################
-# Maximum Number of Credits to be allowed by the NFCC
-#   This value overrides what the NFCC specifices allowing the host to have
-#   the control to work-around transport limitations.  If this value does
-#   not exist or is set to 0, the NFCC will provide the number of credits.
-#MAX_RF_DATA_CREDITS=1
-
-###############################################################################
-# This setting allows you to disable registering the T4t Virtual SE that causes
-# the NFCC to send PPSE requests to the DH.
-# The default setting is enabled (i.e. T4t Virtual SE is registered).
-#REGISTER_VIRTUAL_SE=1
-
-###############################################################################
-# When screen is turned off, specify the desired power state of the controller.
-# 0: power-off-sleep state; DEFAULT
-# 1: full-power state (note: this is still low-power ("snooze") on BRCM devices.
-# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used)
-SCREEN_OFF_POWER_STATE=1
-
-###############################################################################
-# SPD Debug mode
-#  If set to 1, any failure of downloading a patch will trigger a hard-stop
-#SPD_DEBUG=0
-
-###############################################################################
-# SPD Max Retry Count
-#  The number of attempts to download a patch before giving up (defualt is 3).
-#  Note, this resets after a power-cycle.
-#SPD_MAX_RETRY_COUNT=3
-
-###############################################################################
-# transport driver
-#
-# TRANSPORT_DRIVER=<driver>
-#
-#  where <driver> can be, for example:
-#    "/dev/ttyS"        (UART)
-#    "/dev/bcmi2cnfc"   (I2C)
-#    "hwtun"            (HW Tunnel)
-#    "/dev/bcmspinfc"   (SPI)
-#    "/dev/btusb0"      (BT USB)
-TRANSPORT_DRIVER="/dev/bcm2079x"
-
-###############################################################################
-# power control driver
-# Specify a kernel driver that support ioctl commands to control NFC_EN and
-# NFC_WAKE gpio signals.
-#
-# POWER_CONTRL_DRIVER=<driver>
-#  where <driver> can be, for example:
-#    "/dev/nfcpower"
-#    "/dev/bcmi2cnfc"   (I2C)
-#    "/dev/bcmspinfc"   (SPI)
-#    i2c and spi driver may be used to control NFC_EN and NFC_WAKE signal
-POWER_CONTROL_DRIVER="/dev/bcm2079x"
-
-###############################################################################
-# I2C transport driver options
-# BCMI2CNFC_ADDRESS=0
-
-###############################################################################
-# I2C transport driver try to read multiple packets in read() if data is available
-# remove the comment below to enable this feature
-#READ_MULTIPLE_PACKETS=1
-
-###############################################################################
-# SPI transport driver options
-#SPI_NEGOTIATION={0A:F0:00:01:00:00:00:FF:FF:00:00}
-
-###############################################################################
-# UART transport driver options
-#
-# PORT=1,2,3,...
-# BAUD=115200, 19200, 9600, 4800,
-# DATABITS=8, 7, 6, 5
-# PARITY="even" | "odd" | "none"
-# STOPBITS="0" | "1" | "1.5" | "2"
-
-#UART_PORT=2
-#UART_BAUD=115200
-#UART_DATABITS=8
-#UART_PARITY="none"
-#UART_STOPBITS="1"
-
-###############################################################################
-# Insert a delay in microseconds per byte after a write to NFCC.
-# after writing a block of data to the NFCC, delay this an amopunt of time before
-# writing next block of data.  the delay is calculated as below
-#   NFC_WRITE_DELAY * (number of byte written) / 1000 milliseconds
-# e.g. after 259 bytes is written, delay (259 * 20 / 1000) 5 ms before next write
-NFC_WRITE_DELAY=20
-
-###############################################################################
-# Configuration for the RF discovery frequency for each technology. The values mean
-# frequency for NFC Technology A
-#                   Technology B
-#                   Technology F
-#                   Proprietary Technology/15693
-#                   Proprietary Technology/B-Prime
-#                   Proprietary Technology/Kovio
-#                   Technology A active mode
-#                   Technology F active mode
-#POLL_FREQUENCY={01:01:01:01:01:01:01:01}
-
-###############################################################################
-# Choose the presence-check algorithm for type-4 tag.  If not defined,
-# the default value is 1.
-# 0  NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm
-# 1  NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block
-# 2  NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate
-# 3  NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0
-# 4  NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3
-PRESENCE_CHECK_ALGORITHM=1
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
deleted file mode 100644
index 4d4daaf..0000000
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, The Android Open Source 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.
-*/
--->
-
-<!-- See storage config details at http://source.android.com/tech/storage/ -->
-
-<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- internal emulated storage -->
-    <storage
-        android:storageDescription="@string/storage_internal"
-        android:primary="true"
-        android:emulated="true"
-        android:mtpReserve="100" />
-    <storage android:mountPoint="/storage/usb"
-        android:storageDescription="@string/storage_usb"
-        android:removable="true" />
-</StorageList>
diff --git a/proprietary-blobs.txt b/proprietary-blobs.txt
new file mode 100644
index 0000000..a963493
--- /dev/null
+++ b/proprietary-blobs.txt
@@ -0,0 +1,255 @@
+etc/Bluetooth_cal.acdb
+etc/General_cal.acdb
+etc/Global_cal.acdb
+etc/Handset_cal.acdb
+etc/Hdmi_cal.acdb
+etc/Headset_cal.acdb
+etc/Speaker_cal.acdb
+etc/firmware/fw_bcmdhd_apsta.bin
+etc/firmware/fw_bcmdhd.bin
+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.mbn
+etc/firmware/venus.mdt
+etc/firmware/venus.b00
+etc/firmware/venus.b01
+etc/firmware/venus.b02
+etc/firmware/venus.b03
+etc/firmware/venus.b04
+lib/libvss_dmi_qcci.so
+lib/libvss_common_iface.so
+lib/libvss_common_idl.so
+lib/libvss_nv_iface.so
+lib/libvss_nv_core.so
+lib/libvss_nv_idl.so
+lib/libvss_ims_qcci.so
+lib/libvss_common_core.so
+lib/libcnefeatureconfig.so
+lib/libloc_api_v02.so
+lib/libWVphoneAPI.so
+#lib/liblgftmitem.so
+#lib/liblgdrm.so
+#lib/liblgsecclk.so
+#lib/libwvoemprov.so
+#lib/libDxHdcp.so
+#lib/liblgehdcpek.so
+#lib/libdiagd_client.so
+lib/libacdbloader.so
+#bin/atd
+#bin/gsiff_daemon
+bin/rmt_storage
+bin/qmuxd
+lib/libril.so
+bin/rild
+lib/liblgderp.so
+bin/netmgrd
+bin/sensors.qcom
+bin/thermald
+bin/thermal-engine
+bin/mpdecision
+bin/cnd
+bin/qseecomd
+bin/mm-qcamera-daemon
+bin/bridgemgrd
+bin/irsc_util
+bin/time_daemon
+lib/libmmcamera_interface.so
+lib/hw/camera.vendor.msm8974.so
+lib/libHDR.so
+lib/libmorpho_noise_reduction.so
+lib/libmorpho_image_stab31.so
+lib/libmmjpeg_interface.so
+lib/libqomx_core.so
+## Vendor
+vendor/lib/drm/libdrmwvmplugin.so
+vendor/lib/egl/eglsubAndroid.so
+vendor/lib/egl/libEGL_adreno.so
+vendor/lib/egl/libGLESv1_CM_adreno.so
+vendor/lib/egl/libGLESv2_adreno.so
+vendor/lib/egl/libq3dtools_adreno.so
+vendor/lib/egl/libplayback_adreno.so
+vendor/lib/hw/power.msm8974.so
+vendor/lib/hw/sensors.msm8974.so
+vendor/lib/libacdbmapper.so
+vendor/lib/libacdbrtac.so
+vendor/lib/libadiertac.so
+vendor/lib/libadreno_utils.so
+vendor/lib/librs_adreno.so
+vendor/lib/librs_adreno_sha1.so
+vendor/lib/libRSDriver_adreno.so
+vendor/lib/libadsprpc.so
+vendor/lib/libAKM8963.so
+vendor/lib/libaudcal.so
+vendor/lib/libaudioalsa.so
+vendor/lib/libC2D2.so
+vendor/lib/libCB.so
+vendor/lib/libc2d30.so
+vendor/lib/libc2d30-a3xx.so
+vendor/lib/libchromatix_imx132_common.so
+vendor/lib/libchromatix_imx132_default_video.so
+vendor/lib/libchromatix_imx132_mms_video.so
+vendor/lib/libchromatix_imx132_preview.so
+vendor/lib/libchromatix_imx132_vt.so
+vendor/lib/libchromatix_imx135_common.so
+vendor/lib/libchromatix_imx135_default_video.so
+vendor/lib/libchromatix_imx135_fuji_common.so
+vendor/lib/libchromatix_imx135_fuji_default_video.so
+vendor/lib/libchromatix_imx135_fuji_hfr_120.so
+vendor/lib/libchromatix_imx135_fuji_hfr_60.so
+vendor/lib/libchromatix_imx135_fuji_mms_video.so
+vendor/lib/libchromatix_imx135_fuji_preview.so
+vendor/lib/libchromatix_imx135_fuji_snapshot.so
+vendor/lib/libchromatix_imx135_fuji_video_dualrec.so
+vendor/lib/libchromatix_imx135_hfr_60.so
+vendor/lib/libchromatix_imx135_mms_video.so
+vendor/lib/libchromatix_imx135_preview.so
+vendor/lib/libchromatix_imx135_snapshot.so
+vendor/lib/libchromatix_imx135_video_dualrec.so
+vendor/lib/libcneapiclient.so
+vendor/lib/libcneqmiutils.so
+vendor/lib/libcneutils.so
+vendor/lib/libCommandSvc.so
+vendor/lib/libconfigdb.so
+vendor/lib/libcsd-client.so
+vendor/lib/libdiag.so
+vendor/lib/libDivxDrm.so
+vendor/lib/libdrmdecrypt.so
+vendor/lib/libdrmdiag.so
+vendor/lib/libdrmfs.so
+vendor/lib/libdrmtime.so
+vendor/lib/libdsi_netctrl.so
+vendor/lib/libdsnetutils.so
+vendor/lib/libdsutils.so
+vendor/lib/libepdsp.so
+vendor/lib/libExtendedExtractor.so
+vendor/lib/libfastcvopt.so
+vendor/lib/libFileMux.so
+vendor/lib/libgeofence.so
+vendor/lib/libgsl.so
+vendor/lib/libI420colorconvert.so
+vendor/lib/libidl.so
+vendor/lib/libjpegdhw.so
+vendor/lib/libjpegehw.so
+vendor/lib/liblistenhardware.so
+vendor/lib/liblistenjni.so
+vendor/lib/liblisten.so
+vendor/lib/liblistensoundmodel.so
+vendor/lib/libllvm-qcom.so
+vendor/lib/libmm-abl-oem.so
+vendor/lib/libmm-abl.so
+vendor/lib/libmmcamera2_c2d_module.so
+vendor/lib/libmmcamera2_cpp_module.so
+vendor/lib/libmmcamera2_iface_modules.so
+vendor/lib/libmmcamera2_imglib_modules.so
+vendor/lib/libmmcamera2_isp_modules.so
+vendor/lib/libmmcamera2_pproc_modules.so
+vendor/lib/libmmcamera2_sensor_modules.so
+vendor/lib/libmmcamera2_stats_algorithm.so
+vendor/lib/libmmcamera2_stats_modules.so
+vendor/lib/libmmcamera2_vpe_module.so
+vendor/lib/libmmcamera2_wnr_module.so
+vendor/lib/libmmcamera_cac_lib.so
+vendor/lib/libmmcamera_faceproc.so
+vendor/lib/libmmcamera_hdr_lib.so
+vendor/lib/libmmcamera_image_stab.so
+vendor/lib/libmmcamera_imglib.so
+vendor/lib/libmmcamera_imx132.so
+vendor/lib/libmmcamera_imx135_eeprom.so
+vendor/lib/libmmcamera_imx135.so
+vendor/lib/libmmcamera_wavelet_lib.so
+vendor/lib/libmm-color-convertor.so
+vendor/lib/libmmhttpstack.so
+vendor/lib/libmmiipstreammmihttp.so
+vendor/lib/libmmipl.so
+vendor/lib/libmmipstreamaal.so
+vendor/lib/libmmipstreamnetwork.so
+vendor/lib/libmmipstreamsourcehttp.so
+vendor/lib/libmmipstreamutils.so
+vendor/lib/libmmjpeg.so
+vendor/lib/libmmosal.so
+vendor/lib/libmmparser.so
+vendor/lib/libmmqjpeg_codec.so
+vendor/lib/libmmQSM.so
+vendor/lib/libmmrtpdecoder.so
+vendor/lib/libmmrtpencoder.so
+vendor/lib/libmmwfdinterface.so
+vendor/lib/libmmwfdsinkinterface.so
+vendor/lib/libmmwfdsrcinterface.so
+vendor/lib/libmsapm_jni.so
+vendor/lib/libmsapu_jni.so
+vendor/lib/libnetmgr.so
+vendor/lib/libNimsWrap.so
+vendor/lib/liboemcamera.so
+vendor/lib/libOmxAacDec.so
+vendor/lib/libOmxAmrwbplusDec.so
+vendor/lib/libOmxEvrcDec.so
+vendor/lib/libOmxMux.so
+vendor/lib/libOmxQcelp13Dec.so
+vendor/lib/libOmxWmaDec.so
+vendor/lib/libOpenCL.so
+vendor/lib/libOpenVG.so
+vendor/lib/libprdrmdecrypt.so
+vendor/lib/libprofiler_msmadc.so
+vendor/lib/libqcci_legacy.so
+vendor/lib/libqcgesture.so
+vendor/lib/libqc-opt.so
+vendor/lib/libqdi.so
+vendor/lib/libqdp.so
+vendor/lib/libqmi_cci.so
+vendor/lib/libqmi_client_qmux.so
+vendor/lib/libqmi_common_so.so
+vendor/lib/libqmi_csi.so
+vendor/lib/libqmi_csvt_srvc.so
+vendor/lib/libqmi_encdec.so
+vendor/lib/libqmiservices.so
+vendor/lib/libqmi.so
+vendor/lib/libqomx_jpegenc.so
+vendor/lib/libQSEEComAPI.so
+vendor/lib/libquipc_os_api.so
+vendor/lib/libquipc_ulp_adapter.so
+vendor/lib/libril-qc-qmi-1.so
+vendor/lib/libril-qcril-hook-oem.so
+vendor/lib/librpmb.so
+vendor/lib/libsc-a3xx.so
+vendor/lib/libSecureTouchPerfApp.so
+vendor/lib/libsensor1.so
+vendor/lib/libsensor_reg.so
+vendor/lib/libsensor_user_cal.so
+vendor/lib/libSHIMDivxDrm.so
+vendor/lib/libssd.so
+vendor/lib/libSSEPKCS11.so
+vendor/lib/libsubsystem_control.so
+vendor/lib/libsurround_proc.so
+vendor/lib/libthermalclient.so
+vendor/lib/libtime_genoff.so
+vendor/lib/libtzdrmgenprov.so
+vendor/lib/libtzplayready.so
+vendor/lib/libualutil.so
+vendor/lib/libulp2.so
+vendor/lib/libv8.so
+vendor/lib/libvideo_cor.so
+vendor/lib/libwfdcommonutils.so
+vendor/lib/libwfdhdcpcp.so
+vendor/lib/libwfdmmsink.so
+vendor/lib/libwfdmmsrc.so
+vendor/lib/libwfdmmutils.so
+vendor/lib/libwfdnative.so
+vendor/lib/libwfdrtsp.so
+vendor/lib/libwfdsm.so
+vendor/lib/libwfduibcinterface.so
+vendor/lib/libwfduibcsinkinterface.so
+vendor/lib/libwfduibcsink.so
+vendor/lib/libwfduibcsrcinterface.so
+vendor/lib/libwfduibcsrc.so
+vendor/lib/libwvdrm_L1.so
+vendor/lib/libwvm.so
+vendor/lib/libWVStreamControlAPI_L1.so
+vendor/lib/libxml.so
+vendor/lib/pp_proc_plugin.so
+vendor/lib/mediadrm/libwvdrmengine.so
+vendor/firmware/BCM20791B5_002.006.013.0011.0027_LGE_A1_I2C_NCD_Signed_ORC.ncd
+vendor/firmware/BCM20791B5_002.006.013.0011.0027_LGE_A1_PreI2C_NCD_Signed_ORC.ncd
+vendor/firmware/BCM4335B0_002.001.006.0191.0201_ORC.hcd
+vendor/firmware/a330_pfp.fw
+vendor/firmware/a330_pm4.fw
diff --git a/proprietary-files.txt b/proprietary-files.txt
deleted file mode 100644
index d8e72b9..0000000
--- a/proprietary-files.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADSP firmware
-vendor/firmware/adsp.b00
-vendor/firmware/adsp.b01
-vendor/firmware/adsp.b02
-vendor/firmware/adsp.b03
-vendor/firmware/adsp.b04
-vendor/firmware/adsp.b05
-vendor/firmware/adsp.b06
-vendor/firmware/adsp.b08
-vendor/firmware/adsp.b09
-vendor/firmware/adsp.b10
-vendor/firmware/adsp.b11
-vendor/firmware/adsp.b12
-vendor/firmware/adsp.mdt
-
-# Broadcom (NFC) firmware
-vendor/firmware/BCM20791B5_002.006.013.0011.0027_LGE_A1_I2C_NCD_Signed_ORC.ncd
-vendor/firmware/BCM20791B5_002.006.013.0011.0027_LGE_A1_PreI2C_NCD_Signed_ORC.ncd
-
-# Broadcom (Wi-Fi) firmware
-etc/firmware/fw_bcmdhd_apsta.bin
-etc/firmware/fw_bcmdhd.bin
-
-# Camera
-bin/mm-qcamera-daemon
-
-# Radio
-bin/netmgrd
-bin/rild
-lib/libril.so
-
-# Sensors
-bin/sensors.qcom
-
-# Thermal
-bin/thermal-engine
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 0824b54..fbfd6d7 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -6,7 +6,7 @@ OUTDIR=vendor/$VENDOR/$DEVICE
 MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk
 
 (cat << EOF) > $MAKEFILE
-# Copyright (C) 2014 The CyanogenMod Project
+# Copyright (C) 2013 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.
@@ -30,8 +30,8 @@ PRODUCT_COPY_FILES += \\
 EOF
 
 LINEEND=" \\"
-COUNT=`cat proprietary-files.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}`
-for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do
+COUNT=`cat proprietary-blobs.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}`
+for FILE in `cat proprietary-blobs.txt | grep -v ^# | grep -v ^$`; do
     COUNT=`expr $COUNT - 1`
     if [ $COUNT = "0" ]; then
         LINEEND=""
@@ -40,7 +40,7 @@ for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do
 done
 
 (cat << EOF) > ../../../$OUTDIR/$DEVICE-vendor.mk
-# Copyright (C) 2014 The CyanogenMod Project
+# Copyright (C) 2013 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.
@@ -75,7 +75,7 @@ DEVICE_PACKAGE_OVERLAYS := vendor/$VENDOR/$DEVICE/overlay
 EOF
 
 (cat << EOF) > ../../../$OUTDIR/BoardConfigVendor.mk
-# Copyright (C) 2014 The CyanogenMod Project
+# Copyright (C) 2013 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.
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100755
index 3667a8d..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1 +0,0 @@
-add_lunch_combo cm_d803-userdebug