matisse-common: fix partitions size

Moreover, because of encryption, define a userdata partition smaller of 16 kB (16384 B) than the real one.

Change-Id: I3f94f76d8d1620af61892811068d70811b74d6e5

Android.bp

@@ -1,2 +1,3 @@
 soong_namespace {
+    imports: ["device/samsung/msm8226-common"],
 }

BoardConfigCommon.mk

@@ -1,5 +1,5 @@
 # Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017,2021 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.
@@ -22,7 +22,6 @@ TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include
 
 # Audio
 USE_CUSTOM_AUDIO_POLICY := 1
-USE_XML_AUDIO_POLICY_CONF := 1
 
 # APEX
 TARGET_FLATTEN_APEX := true
@@ -66,7 +65,7 @@ BOARD_KERNEL_SEPARATED_DT := true
 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000 --tags_offset 0x1e00000
 BOARD_CUSTOM_BOOTIMG := true
 BOARD_CUSTOM_BOOTIMG_MK := hardware/samsung/mkbootimg.mk
-LZMA_RAMDISK_TARGETS := recovery
+BOARD_RAMDISK_USE_XZ := true
 TARGET_KERNEL_SOURCE := kernel/samsung/msm8226
 
 # Legacy BLOB Support
@@ -82,8 +81,8 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 BOARD_BOOTIMAGE_PARTITION_SIZE := 10485760
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 10485760
 BOARD_CACHEIMAGE_PARTITION_SIZE := 314572800
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2362232012
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 12884901888
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2411724800
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 12843642880
 TARGET_USES_MKE2FS := true
 
 # Power HAL
@@ -112,5 +111,4 @@ include $(COMMON_PATH)/sepolicy/sepolicy.mk
 TARGET_NO_SENSOR_PERMISSION_CHECK := true
 
 # inherit from the proprietary version
--include vendor/samsung/matisse-common/BoardConfigVendor.mk
-
+include vendor/samsung/matisse-common/BoardConfigVendor.mk

common-proprietary-files.txt

@@ -144,43 +144,32 @@ vendor/lib/libqti-perfd-client.so|909e0a3d1b7a86030f58b165d5f761fc50183ff0
 vendor/lib/libxml.so|251560fdf50b82c15f481bfc6cf12235c42e19c9
 
 # Qualcomm Framework - Pinned to Samsung Galaxy S5 G900FXXS1BPCL_G900FOXA1BOJ1_BTU
-lib/libmdmdetect.so:vendor/lib/libmdmdetect.so|9c19d5aacc094597c166529386f83ac721ac1979
-lib/libperipheral_client.so:vendor/lib/libperipheral_client.so|7107a8e656fabc5ff6b7a33740be80a1add6abbd
-vendor/lib/libconfigdb.so|a7eedfbb0ffa070c9239f0d293262e268342da1d
-vendor/lib/libdiag.so|2dd30d2de57567aa4575f98e4679cdbd625bbbe6
 vendor/lib/libdsi_netctrl.so|d5d25fd5b1ea250bdfcb64059eafaf609fe2e32c
-vendor/lib/libdsutils.so|99fac25d6a10ea89a7f66cfc7c3a36478a178568
-vendor/lib/libidl.so|9b871bda84a1204b35b5a93311d666aa36a7f8b8
-vendor/lib/libnetmgr.so|fc8dcd60b4fd28518e03949842dd6b496712c2d1
-vendor/lib/libqcci_legacy.so|5f0f25a72677d0b3183031490e45b6de26735327
 vendor/lib/libqdi.so|6bd79ba4dc4b4af654cda666e829312ba07a22e9
-vendor/lib/libqmi.so|d120b126ba94cb2d4164243ef7a8516168b6fedf
-vendor/lib/libqmi_cci.so|b94c84c54183e538a7802ca531da7cf2b8176614
-vendor/lib/libqmi_client_qmux.so|79cb7b305bd9f87c581f26c805f4ca2bbdf3a069
-vendor/lib/libqmi_common_so.so|6c70d0c23898f4d5aa5a962736a06aa3d21e7aa6
-vendor/lib/libqmi_csi.so|dee249a1f0fff082b5e5547cfab103ac10ab55e2
-vendor/lib/libqmi_encdec.so|82e39ae7e4bb8651d06fdae99fc38e3fb390b62d
-vendor/lib/libqmiservices.so|0b90d67d7ec0b0bc3de2b5ccc3afcda13bd5ffd8
 
-# Radio
-lib/libatparser.so:vendor/lib/libatparser.so
-lib/libcordon.so:vendor/lib/libcordon.so
-lib/libfactoryutil.so:vendor/lib/libfactoryutil.so
-lib/libomission_avoidance.so:vendor/lib/libomission_avoidance.so
-
-# Radio - Pinned to Samsung Galaxy S5 G900FXXS1BPCL_G900FOXA1BOJ1_BTU
-bin/efsks:vendor/bin/efsks|2c366ac7ab878068c77e5598c411a48cf47b056a
-bin/ks:vendor/bin/ks|949406ae5d1b74034b3828af1905a181e4b69961
-bin/qcks:vendor/bin/qcks|9026c84f32e1ee5121024c72b878c09dfde95e5b
-bin/qmuxd:vendor/bin/qmuxd|e257d63996812e2eb23810bda59913f558ee03d2
-bin/rfs_access:vendor/bin/rfs_access|49a8516ed01b609a9e5079d8135b75db5b024236
-bin/rmt_storage:vendor/bin/rmt_storage|000ddcabfc9416e9a27ba6d04860cc14b6803cdd
-vendor/lib/libril-qcril-hook-oem.so|6a73ed46f4fbcb283eea5fb44b24a7d14522bfe5
+# Qualcomm Framework - Pinned to Samsung Galaxy S5 Mini G800HXXU1CRJ1_G800HXEO1CRJ1
+lib/libmdmdetect.so:vendor/lib/libmdmdetect.so|e5d6994a2bfab72e55d48911e69e856ff804266a
+vendor/lib/libconfigdb.so|b833c67294b90af93d0ed7c4945ae0286970a957
+vendor/lib/libdiag.so|361ef99bcf63c7a6a2db6f51aa62beb019fb207a
+vendor/lib/libdsutils.so|1da55f6782855f8e914688213350401e43d20c31
+vendor/lib/libidl.so|36c9957ea258affe5523a7c88a4dda9647be8a28
+vendor/lib/libnetmgr.so|c922e27e0141edc358bd4a1d3bac98d97e66849e
+vendor/lib/libperipheral_client.so|6db947cce57cf6abd440581113563d60ec29086c
+vendor/lib/libqcci_legacy.so|07a6cc82f36b5271b61b823c6230e04d622692ed
+vendor/lib/libqmi.so|2d4478b793b08bc41ad5598df74db42ce4a53868
+vendor/lib/libqmi_cci.so|a0e5d1c638d1535a752997b9741f25556f3dac64
+vendor/lib/libqmi_client_qmux.so|06762650b756ba9e4952fe6b44b0db892cc5ac3b
+vendor/lib/libqmi_common_so.so|3897273e86aa97f48a746fd99842b9c9c7911156
+vendor/lib/libqmi_csi.so|538b67bf4ddff038ec166f58aa17280d4d0a53d6
+vendor/lib/libqmi_encdec.so|cb34e91bddb631a1e0761210be9022004349b37e
+vendor/lib/libqmiservices.so|7c9983e79c1bca269069ef6dc0a5e549d4009ad4
 
 # Radio - Pinned to Samsung Galaxy S5 Mini G800HXXU1CRJ1_G800HXEO1CRJ1
-bin/ds_fmc_appd:vendor/bin/ds_fmc_appd|80eb4cd64d23a82a9a8c2aeafa9128d5e8158bdd
-vendor/lib/libdsnetutils.so|bf7097980412a364c941aefcadfbe89066fdecf1
-vendor/lib/libdsucsd.so|1f739bcb91330edb307329f851f031d56723672f
+bin/qmuxd:vendor/bin/qmuxd|cfc4752ad51a706f0b7a26dd78c1c2da74a0ea64
+bin/rfs_access:vendor/bin/rfs_access|1ec2c9f2d81a1fdc6f676ed0ca882bd80aecad4a
+bin/rmt_storage:vendor/bin/rmt_storage|37e230681465c787ff48ef431f94fcf31b3afbf3
+lib/libprotobuf-cpp-full.so:vendor/lib/libprotobuf-cpp-full-v23.so|b16f9545bd719238d2eb9badcbd4391013b7af5a
+vendor/lib/libril-qcril-hook-oem.so|e7157ae0f219a9060f7a559565122a3db763f2b2
 
 # Sensors
 lib/hw/sensors.msm8226.so:vendor/lib/hw/sensors.vendor.msm8226.so

extract-files.sh

@@ -1,66 +1,39 @@
 #!/bin/bash
 #
 # Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2021 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 set -e
 
+if [ -z "${DEVICE_COMMON}" ]; then
+    echo ""
+    echo "error: This is a script in a common tree. Please execute" $(basename $0) "from a device tree."
+    echo ""
+    exit 1
+fi
+
 # Load extract_utils and do some sanity checks
 MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="$PWD"; fi
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
-LINEAGE_ROOT="${MY_DIR}/../../.."
+ANDROID_ROOT="${MY_DIR}/../../.."
 
-HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then
     echo "Unable to find helper script at ${HELPER}"
     exit 1
 fi
-. "${HELPER}"
+source "${HELPER}"
 
-if [ $# -eq 0 ]; then
-    SRC=adb
-else
-    if [ $# -eq 1 ]; then
-        SRC="${1}"
-    else
-        echo "$0: bad number of arguments"
-        echo ""
-        echo "usage: $0 [PATH_TO_EXPANDED_ROM]"
-        echo ""
-        echo "If PATH_TO_EXPANDED_ROM is not specified, blobs will be extracted from"
-        echo "the device using adb pull."
-        exit 1
-    fi
-fi
+setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
 
-# Initialize the helper for common device
-setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true
-
-extract "${MY_DIR}/common-proprietary-files.txt" "${SRC}"
-
-COMMON_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE_COMMON}/proprietary"
-
-# Reinitialize the helper for device
-setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}"
-
-for BLOB_LIST in "${MY_DIR}/../${DEVICE}/device-proprietary-files*.txt"; do
+for BLOB_LIST in "${MY_DIR}"/common-proprietary-files*.txt; do
     extract "${BLOB_LIST}" "${SRC}"
 done
 
-./../msm8226-common/extract-files.sh $@
+export BOARD_COMMON=msm8226-common
 
-"${MY_DIR}/setup-makefiles.sh"
+"./../../${VENDOR}/${BOARD_COMMON}/extract-files.sh" "$@"

include/telephony/ril.h

@@ -108,6 +108,7 @@ extern "C" {
 #define MAX_BANDS 8
 #define MAX_CHANNELS 32
 #define MAX_RADIO_ACCESS_NETWORKS 8
+#define MAX_BROADCAST_SMS_CONFIG_INFO 25
 
 
 typedef void * RIL_Token;

init/Android.bp

@@ -23,5 +23,8 @@ cc_library_static {
         "system/core/base/include",
         "system/core/init",
     ],
+    shared_libs: [
+        "libbase",
+    ],
     whole_static_libs: ["libinit_helpers_sam8226"]
 }

init/init_matisse.cpp

@@ -36,7 +36,6 @@
 #include "init_msm8226.h"
 
 using android::base::GetProperty;
-using android::init::property_set;
 
 void vendor_load_properties()
 {

manifest.xml

@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device">
+<manifest version="1.0" type="device" target-level="legacy">
     <hal format="hidl">
         <name>android.hardware.light</name>
         <transport>hwbinder</transport>
@@ -16,5 +16,9 @@
             <name>IDisplayColorCalibration</name>
             <instance>default</instance>
         </interface>
+        <interface>
+            <name>IReadingEnhancement</name>
+            <instance>default</instance>
+        </interface>
     </hal>    
 </manifest>

matisse.mk

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2014-2016 The CyanogenMod Project
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2018,2021 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.
@@ -104,7 +104,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/thermal-engine-8226.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-8226.conf
 
 # Get non-open-source specific aspects
-$(call inherit-product-if-exists, vendor/samsung/matisse-common/matisse-common-vendor.mk)
+$(call inherit-product, vendor/samsung/matisse-common/matisse-common-vendor.mk)
 
 # common msm8226
 $(call inherit-product, device/samsung/msm8226-common/msm8226.mk)

overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml

@@ -43,4 +43,12 @@
          For example, a device with Home, Back and Menu keys would set this
          config to 7. -->
     <integer name="config_deviceHardwareWakeKeys">65</integer>
+
+    <!-- Button backlight control. Possible values are:
+            0 - Not supported
+            1 - Supported, but only on/off mode
+            2 - Supported with variable brightness control
+    -->
+    <integer name="config_deviceSupportsButtonBrightnessControl">0</integer>
+
 </resources>

overlay/frameworks/base/core/res/res/values/config.xml

@@ -50,7 +50,7 @@
 
     <!-- Minimum screen brightness setting allowed by the power manager.
          The user is forbidden from setting the brightness below this level. -->
-    <integer name="config_screenBrightnessSettingMinimum">35</integer>
+    <integer name="config_screenBrightnessSettingMinimum">24</integer>
 
       <!-- Maximum screen brightness allowed by the power manager.
          The user is forbidden from setting the brightness above this level. -->
@@ -84,37 +84,6 @@
         <item>"7,1"</item>
     </string-array>
 
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         USB interfaces.  If the device doesn't want to support tething over USB this should
-         be empty.  An example would be "usb.*" -->
-    <string-array translatable="false" name="config_tether_usb_regexs">
-        <item>"rndis0"</item>
-        <item>"usb0"</item>
-    </string-array>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         Wifi interfaces.  If the device doesn't want to support tethering over Wifi this
-         should be empty.  An example would be "softap.*" -->
-    <string-array translatable="false" name="config_tether_wifi_regexs">
-        <item>"wlan0"</item>
-    </string-array>
-
-    <!-- List of regexpressions describing the interface (if any) that represent tetherable
-         bluetooth interfaces.  If the device doesn't want to support tethering over bluetooth this
-         should be empty. -->
-    <string-array translatable="false" name="config_tether_bluetooth_regexs">
-        <item>"bt-pan"</item>
-    </string-array>
-
-    <!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
-    <bool translatable="false" name="config_wifi_dual_band_support">true</bool>
-
-    <!-- Boolean indicating whether the wifi chipset has background scan support -->
-    <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
-
-    <!-- Enables or disables fading edges when marquee is enabled in TextView. -->
-    <bool name="config_ui_enableFadingMarquee">false</bool>
-
     <!-- The VoiceMail default value is displayed to my own number if it is true -->
     <bool name="config_telephony_use_own_number_for_voicemail">true</bool>
 
@@ -166,9 +135,7 @@
     -->
     <integer name="config_longPressOnHomeBehavior">3</integer>
 
-    <!-- Configure wifi tcp buffersizes in the form:
-         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
-    <string name="config_wifi_tcp_buffers" translatable="false">524288,2097152,4194304,262144,524288,1048576</string>
+    <bool name="config_enableWifiDisplay">true</bool>
 
     <string-array name="config_mobile_tcp_buffers">
         <item>lte:2097152,4194304,8388608,262144,524288,1048576</item>

overlay/frameworks/base/core/res/res/values/strings.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2018, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds.  Do not translate. -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Do not translate. Default access point SSID used for tethering -->
-    <string name="wifi_tether_configure_ssid_default" translatable="false">Galaxy Tab 4</string>
-</resources>

overlay/frameworks/base/core/res/res/xml/power_profile.xml

@@ -21,11 +21,13 @@
         <value>4</value>
     </array>    
     <array name="cpu.core_speeds.cluster0">
-        <value>12000000</value>
-        <value>10000000</value>
-        <value>800000</value>
-        <value>500000</value>
-        <value>200000</value>
+        <value>1190400</value>
+        <value>1094400</value>
+        <value>998400</value>
+        <value>787200</value>
+        <value>600000</value>
+        <value>384000</value>
+        <value>300000</value>
     </array>
     <item name="cpu.suspend">4</item>
     <array name="cpu.core_power.cluster0">

overlay/frameworks/base/packages/Tethering/res/values/config.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+<resources>
+    <!-- List of regexpressions describing the interface (if any) that represent tetherable
+         USB interfaces.  If the device doesn't want to support tething over USB this should
+         be empty.  An example would be "usb.*" -->
+    <string-array translatable="false" name="config_tether_usb_regexs">
+        <item>"rndis0"</item>
+        <item>"usb0"</item>
+    </string-array>
+
+    <!-- List of regexpressions describing the interface (if any) that represent tetherable
+         Wifi interfaces.  If the device doesn't want to support tethering over Wifi this
+         should be empty.  An example would be "softap.*" -->
+    <string-array translatable="false" name="config_tether_wifi_regexs">
+        <item>"wlan0"</item>
+    </string-array>
+
+    <!-- List of regexpressions describing the interface (if any) that represent tetherable
+         Wifi P2P interfaces.  If the device doesn't want to support tethering over Wifi P2p this
+         should be empty.  An example would be "p2p-p2p.*" -->
+    <string-array translatable="false" name="config_tether_wifi_p2p_regexs">
+        <item>"p2p0"</item>
+    </string-array>
+
+    <!-- List of regexpressions describing the interface (if any) that represent tetherable
+         bluetooth interfaces.  If the device doesn't want to support tethering over bluetooth this
+         should be empty. -->
+    <string-array translatable="false" name="config_tether_bluetooth_regexs">
+        <item>"bt-pan"</item>
+    </string-array>
+</resources>

overlay/frameworks/opt/net/wifi/service/res/values/config.xml

@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Boolean indicating whether the wifi chipset has 5GHz frequency band support -->
+    <bool translatable="false" name="config_wifi5ghzSupport">true</bool>
+
+    <!-- Boolean indicating whether the wifi chipset has background scan support -->
+    <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
+
+    <!-- Configure wifi tcp buffersizes in the form:
+         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
+    <string name="config_wifi_tcp_buffers" translatable="false">524288,2097152,4194304,262144,524288,1048576</string>
+
+    <!-- Enable WPA2 to WPA3 auto-upgrade -->
+    <bool translatable="false" name="config_wifiSaeUpgradeEnabled">false</bool>
+
+    <!-- Do not translate. Default access point SSID used for tethering -->
+    <string name="wifi_tether_configure_ssid_default" translatable="false">Galaxy Tab 4</string>
+</resources>

sepolicy/sepolicy.mk

@@ -15,5 +15,5 @@
 #
 
 # Board specific SELinux policy variable definitions
-BOARD_SEPOLICY_DIRS += \
+BOARD_VENDOR_SEPOLICY_DIRS += \
     device/samsung/matisse-common/sepolicy/common

setup-makefiles.sh

@@ -1,62 +1,45 @@
 #!/bin/bash
 #
 # Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2021 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.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 set -e
 
-export INITIAL_COPYRIGHT_YEAR=2014
+if [ -z "${DEVICE_COMMON}" ]; then
+    echo ""
+    echo "error: This is a script in a common tree. Please execute" $(basename $0) "from a device tree."
+    echo ""
+    exit 1
+fi
 
 # 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}/../../.."
+ANDROID_ROOT="${MY_DIR}/../../.."
 
-HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then
     echo "Unable to find helper script at ${HELPER}"
     exit 1
 fi
-. "${HELPER}"
+source "${HELPER}"
 
-# Initialize the helper for common device
-setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true
+# Initialize the helper for common
+setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
 
-# Copyright headers and common guards
+# Warning headers and guards
 write_headers "matissewifi matisse3g matisselte"
 
-write_makefiles "${MY_DIR}/common-proprietary-files.txt"
+# The standard common blobs
+write_makefiles "${MY_DIR}/common-proprietary-files.txt" true
 
+# Finish
 write_footers
 
-if [ ! -z "${VARIANT_COPYRIGHT_YEAR}" ]; then
-    export INITIAL_COPYRIGHT_YEAR="${VARIANT_COPYRIGHT_YEAR}"
-fi
+export BOARD_COMMON=msm8226-common
 
-# Reinitialize the helper for device
-setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}"
-
-# Copyright headers and guards
-write_headers
-
-for BLOB_LIST in "${MY_DIR}/../${DEVICE}/device-proprietary-files*.txt"; do
-    write_makefiles ${BLOB_LIST}
-done
-
-write_footers
-
-./../msm8226-common/setup-makefiles.sh $@
+"./../../${VENDOR}/${BOARD_COMMON}/setup-makefiles.sh" "$@"

system.prop

@@ -27,18 +27,6 @@ ro.qualcomm.bt.hci_transport=smd
 # Camera
 camera2.portability.force_api=1
 
-# Display
-ro.hdcp2.rx=tz
-ro.qualcomm.cabl=1
-ro.secwvk=144
-debug.sf.disable_backpressure=1
-debug.sf.latch_unsignaled=1
-debug.sf.recomputecrop=0
-debug.egl.hw=1
-debug.composition.type=c2d
-debug.disable.bwc=1
-dev.pm.dyn_samplingrate=1
-
 # GPS
 persist.gps.qc_nlp_in_use=0
 ro.gps.agps_provider=1