Update extract-files.sh and proprietary-files.txt.

2 files changed, 27 insertions, 70 deletions

diff --git a/extract-files.sh b/extract-files.sh
index c5e540e..33d188c 100644..100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -20,55 +20,9 @@ set -e
 
 # Required!
 export DEVICE=z2_plus
+export DEVICE_COMMON=msm8996-common
 export VENDOR=zuk
 
 export DEVICE_BRINGUP_YEAR=2016
 
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
-
-LINEAGE_ROOT="$MY_DIR"/../../..
-
-HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh
-if [ ! -f "$HELPER" ]; then
-    echo "Unable to find helper script at $HELPER"
-    exit 1
-fi
-. "$HELPER"
-
-# Default to sanitizing the vendor folder before extraction
-CLEAN_VENDOR=true
-
-while [ "$1" != "" ]; do
-    case $1 in
-        -p | --path )           shift
-                                SRC=$1
-                                ;;
-        -s | --section )        shift
-                                SECTION=$1
-                                CLEAN_VENDOR=false
-                                ;;
-        -n | --no-cleanup )     CLEAN_VENDOR=false
-                                ;;
-    esac
-    shift
-done
-
-if [ -z "$SRC" ]; then
-    SRC=adb
-fi
-
-# Initialize the helper for common device
-setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" true "$CLEAN_VENDOR"
-
-extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION"
-
-if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then
-    # Reinitialize the helper for device
-    setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR"
-
-    extract "$MY_DIR"/../$DEVICE/proprietary-files.txt "$SRC" "$SECTION"
-fi
-
-"$MY_DIR"/setup-makefiles.sh
+./../../$VENDOR/$DEVICE_COMMON/extract-files.sh "$@"
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e86fffa..4ea406e 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -7,42 +7,45 @@ vendor/etc/acdbdata/MTP/MTP_Global_cal.acdb
 vendor/etc/acdbdata/MTP/MTP_Hdmi_cal.acdb
 vendor/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb
 
-# Audio capabilities
-etc/capability.xml
-
-# Camera actuators
+# Camera actuator
 vendor/lib/libactuator_dw9767.so
 
 # Camera chromatix
-vendor/lib/libchromatix_s5k2m8sx_default_video.so
-vendor/lib/libchromatix_s5k2m8sx_hfr_60_dw9767.so
-vendor/lib/libchromatix_s5k2m8sx_hfr_90_dw9767.so
-vendor/lib/libchromatix_s5k2m8sx_cpp_preview.so
-vendor/lib/libchromatix_s5k2m8sx_zsl_video_dw9767.so
 vendor/lib/libchromatix_s5k2m8sx_common.so
-vendor/lib/libchromatix_s5k2m8sx_snapshot.so
-vendor/lib/libchromatix_s5k2m8sx_default_video_dw9767.so
-vendor/lib/libchromatix_s5k2m8sx_liveshot.so
+vendor/lib/libchromatix_s5k2m8sx_cpp_hfr_120.so
+vendor/lib/libchromatix_s5k2m8sx_cpp_hfr_60.so
+vendor/lib/libchromatix_s5k2m8sx_cpp_hfr_90.so
+vendor/lib/libchromatix_s5k2m8sx_cpp_liveshot.so
+vendor/lib/libchromatix_s5k2m8sx_cpp_preview.so
 vendor/lib/libchromatix_s5k2m8sx_cpp_snapshot.so
+vendor/lib/libchromatix_s5k2m8sx_cpp_video.so
+vendor/lib/libchromatix_s5k2m8sx_default_preview_dw9767.so
+vendor/lib/libchromatix_s5k2m8sx_default_video_dw9767.so
+vendor/lib/libchromatix_s5k2m8sx_default_video.so
+vendor/lib/libchromatix_s5k2m8sx_hfr_120_dw9767.so
 vendor/lib/libchromatix_s5k2m8sx_hfr_120.so
+vendor/lib/libchromatix_s5k2m8sx_hfr_60_dw9767.so
 vendor/lib/libchromatix_s5k2m8sx_hfr_60.so
-vendor/lib/libchromatix_s5k2m8sx_cpp_liveshot.so
+vendor/lib/libchromatix_s5k2m8sx_hfr_90_dw9767.so
 vendor/lib/libchromatix_s5k2m8sx_hfr_90.so
-vendor/lib/libchromatix_s5k2m8sx_hfr_120_dw9767.so
-vendor/lib/libchromatix_s5k2m8sx_cpp_hfr_60.so
-vendor/lib/libchromatix_s5k2m8sx_zsl_preview_dw9767.so
-vendor/lib/libchromatix_s5k2m8sx_cpp_hfr_90.so
-vendor/lib/libchromatix_s5k2m8sx_default_preview_dw9767.so
-vendor/lib/libchromatix_s5k2m8sx_cpp_hfr_120.so
+vendor/lib/libchromatix_s5k2m8sx_liveshot.so
 vendor/lib/libchromatix_s5k2m8sx_postproc.so
 vendor/lib/libchromatix_s5k2m8sx_preview.so
-vendor/lib/libchromatix_s5k2m8sx_cpp_video.so
+vendor/lib/libchromatix_s5k2m8sx_snapshot.so
+vendor/lib/libchromatix_s5k2m8sx_zsl_preview_dw9767.so
+vendor/lib/libchromatix_s5k2m8sx_zsl_video_dw9767.so
 
 # Camera configs
 etc/camera/msm8996_camera.xml
 etc/camera/s5k2m8sx_chromatix.xml
 
-# Camera libs
+# Camera eeproms
 vendor/lib/libmmcamera_onsemi_cat24c64_eeprom.so
-vendor/lib/libjni_dualcamera.so
+
+# Camera sensors
+vendor/lib/libmmcamera_ov8865.so
 vendor/lib/libmmcamera_s5k2m8sx.so
+
+# Sensors
+vendor/etc/sensors/hals.conf
+vendor/etc/sensors/sensor_def_qcomdev.conf