Revert "matisse-common: Use TARGET_SCREEN_DENSITY"

This reverts commit 6f35c9ee0b. Change-Id: I13574cf8ec2caa52a61cbe29f852032f30c1ff1c
Revert "matisse-common: Move hardware specific .rc files to /vendor/etc/init/hw"
2022-11-11 14:47:11 +01:00 · 2022-02-08 15:41:08 +01:00 · 2022-02-07 12:45:07 +01:00 · 2022-02-07 12:38:07 +01:00 · 2021-12-19 16:32:55 +01:00 · 2021-12-18 22:34:02 +01:00
8 changed files with 61 additions and 57 deletions
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@ -45,9 +45,6 @@ BUILD_FINGERPRINT := samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXS1BRH1
 BOARD_NO_CHARGER_LED := true
 BOARD_CHARGER_DISABLE_INIT_BLANK := true

-# Display
-TARGET_SCREEN_DENSITY := 160
-
 # Extended Filesystem Support
 TARGET_EXFAT_DRIVER := sdfat

@ -55,7 +52,7 @@ TARGET_EXFAT_DRIVER := sdfat
 DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml

 # Init
-TARGET_INIT_VENDOR_LIB := //$(COMMON_PATH):libinit_matisse
+TARGET_INIT_VENDOR_LIB := libinit_matisse

 # Kernel
 BOARD_KERNEL_BASE := 0x00000000
@ -82,8 +79,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
--- a/init/Android.bp
+++ b/init/Android.bp
@ -1,27 +0,0 @@
-/*
-   Copyright (C) 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.
- */
-
-cc_library_static {
-    name: "libinit_matisse",
-    recovery_available: true,
-    srcs: ["init_matisse.cpp"],
-    include_dirs: [
-        "device/samsung/msm8226-common/init",
-        "system/core/base/include",
-        "system/core/init",
-    ],
-    whole_static_libs: ["libinit_helpers_sam8226"]
-}
--- a/init/Android.mk
+++ b/init/Android.mk
@ -0,0 +1,31 @@
+#
+# Copyright (C) 2020 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+LOCAL_C_INCLUDES := \
+    device/samsung/msm8226-common/init \
+    system/core/base/include \
+    system/core/init
+LOCAL_CFLAGS := -Wall -DANDROID_TARGET=\"$(TARGET_BOARD_PLATFORM)\"
+LOCAL_SRC_FILES := init_matisse.cpp
+LOCAL_MODULE := libinit_matisse
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libinit_helpers_sam8226
+
+include $(BUILD_STATIC_LIBRARY)
--- a/init/init_matisse.cpp
+++ b/init/init_matisse.cpp
@ -40,47 +40,46 @@ using android::init::property_set;

 void vendor_load_properties()
 {
+    std::string platform = GetProperty("ro.board.platform", "");
+    if (platform != ANDROID_TARGET)
+        return;
+
    std::string bootloader = GetProperty("ro.bootloader", "");

    if (bootloader.find("T530XX") == 0) {
        /* matissewifixx */
+        property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXS1BRH1:user/release-keys");
        property_override("ro.build.description", "matissewifixx-user 5.0.2 LRX22G T530XXS1BRH1 release-keys");
-        set_ro_product_prop("device", "matissewifi");
-        set_ro_build_prop("fingerprint", "samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXS1BRH1:user/release-keys");
-        set_ro_product_prop("model", "SM-T530");
-        set_ro_product_prop("name", "matissewifi");
+        property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T530");
+        property_override_dual("ro.product.device", "ro.product.vendor.device", "matissewifi");
        wifi_properties("wifi-only", "1");
    } else if (bootloader.find("T530NU") == 0) {
        /* matissewifiue */
+        property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matissewifiue/matissewifiue:5.0.2/LRX22G/T530NUUEU1BQC1:user/release-keys");
        property_override("ro.build.description", "matissewifiue-user 5.0.2 LRX22G T530NUUEU1BQC1 release-keys");
-        set_ro_product_prop("device", "matissewifiue");
-        set_ro_build_prop("fingerprint", "samsung/matissewifiue/matissewifiue:5.0.2/LRX22G/T530NUUEU1BQC1:user/release-keys");
-        set_ro_product_prop("model", "SM-T530NU");
-        set_ro_product_prop("name", "matissewifiue");
+        property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T530NU");
+        property_override_dual("ro.product.device", "ro.product.vendor.device", "matissewifiue");
        wifi_properties("wifi-only", "1");
    } else if (bootloader.find("T531XX") == 0) {
        /* matisse3gxx */
+        property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matisse3gxx/matisse3g:5.0.2/LRX22G/T531XXS1BRH1:user/release-keys");
        property_override("ro.build.description", "matisse3gxx-user 5.0.2 LRX22G T531XXS1BRH1 release-keys");
-        set_ro_product_prop("device", "matisse3g");
-        set_ro_build_prop("fingerprint", "samsung/matisse3gxx/matisse3g:5.0.2/LRX22G/T531XXS1BRH1:user/release-keys");
-        set_ro_product_prop("model", "SM-T531");
-        set_ro_product_prop("name", "matisse3g");
+        property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T531");
+        property_override_dual("ro.product.device", "ro.product.vendor.device", "matisse3g");
        gsm_properties("3", "0");
    } else if (bootloader.find("T532XX") == 0) {
        /* matisse3gjvxx */
+        property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matisse3gjv/matisse3g:5.0.2/LRX22G/T532JVS1BQB1:user/release-keys");
        property_override("ro.build.description", "matisse3gjv-user 5.0.2 LRX22G T532JVS1BQB1 release-keys");
-        set_ro_product_prop("device", "matisse3gjv");
-        set_ro_build_prop("fingerprint", "samsung/matisse3gjv/matisse3g:5.0.2/LRX22G/T532JVS1BQB1:user/release-keys");
-        set_ro_product_prop("model", "SM-T532");
-        set_ro_product_prop("name", "matisse3gjv");
+        property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T532");
+        property_override_dual("ro.product.device", "ro.product.vendor.device", "matisse3gjv");
        gsm_properties("3", "0");
    } else if (bootloader.find("T535XX") == 0) {
        /* matisseltexx */
+        property_override_dual("ro.build.fingerprint","ro.vendor.build.fingerprint", "samsung/matisseltexx/matisselte:5.0.2/LRX22G/T535XXS1BRJ2:user/release-keys");
        property_override("ro.build.description", "matisseltexx-user 5.0.2 LRX22G T535XXS1BRJ2 release-keys");
-        set_ro_product_prop("device", "matisselte");
-        set_ro_build_prop("fingerprint", "samsung/matisseltexx/matisselte:5.0.2/LRX22G/T535XXS1BRJ2:user/release-keys");
-        set_ro_product_prop("model", "SM-T535");
-        set_ro_product_prop("name", "matisselte");
+        property_override_dual("ro.product.model", "ro.product.vendor.model", "SM-T535");
+        property_override_dual("ro.product.device", "ro.product.vendor.device", "matisselte");
        gsm_properties("9", "1");
    } else {
        wifi_properties("wifi-only", "1");
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@ -7,7 +7,7 @@ LOCAL_MODULE       := fstab.qcom
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/fstab.qcom
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)

 include $(CLEAR_VARS)
@ -15,5 +15,5 @@ LOCAL_MODULE       := init.target.rc
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.target.rc
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@ -8,8 +8,8 @@
 /dev/block/platform/msm_sdcc.1/by-name/userdata     /data           f2fs    nosuid,nodev,noatime,rw,inline_xattr                                                            wait,check,formattable,latemount,encryptable=footer,length=-16384
 /dev/block/platform/msm_sdcc.1/by-name/cache        /cache          ext4    nosuid,nodev,noatime,noauto_da_alloc,errors=continue,commit=20                                  wait,check,formattable
 /dev/block/platform/msm_sdcc.1/by-name/cache        /cache          f2fs    nosuid,nodev,noatime,rw,inline_xattr                                                            wait,check,formattable
-/dev/block/platform/msm_sdcc.1/by-name/apnhlos      /firmware       vfat    ro,shortname=lower,uid=1000,gid=1026,dmask=222,fmask=333						                wait
-/dev/block/platform/msm_sdcc.1/by-name/modem        /firmware-modem vfat    ro,shortname=lower,uid=1000,gid=1026,dmask=227,fmask=337						                wait
+/dev/block/platform/msm_sdcc.1/by-name/apnhlos      /firmware       sdfat   ro,shortname=lower,uid=1000,gid=1026,dmask=222,fmask=333,context=u:object_r:firmware_file:s0    wait
+/dev/block/platform/msm_sdcc.1/by-name/modem        /firmware-modem sdfat   ro,shortname=lower,uid=1000,gid=1026,dmask=227,fmask=337,context=u:object_r:firmware_file:s0    wait
 /dev/block/platform/msm_sdcc.1/by-name/persist      /persist        ext4    nosuid,nodev,noatime,noauto_da_alloc,journal_async_commit,errors=panic                          wait,check
 /dev/block/platform/msm_sdcc.1/by-name/efs          /efs            ext4    nosuid,nodev,noatime,noauto_da_alloc,journal_async_commit,errors=panic                          wait,check
 /dev/block/platform/msm_sdcc.1/by-name/fota         /misc           emmc    defaults                                                                                        defaults
--- a/sepolicy/common/firmware_file.te
+++ b/sepolicy/common/firmware_file.te
@ -0,0 +1 @@
+allow firmware_file rootfs:filesystem associate;
--- a/system.prop
+++ b/system.prop
@ -27,6 +27,9 @@ ro.qualcomm.bt.hci_transport=smd
 # Camera
 camera2.portability.force_api=1

+# Display
+ro.sf.lcd_density=160
+
 # GPS
 persist.gps.qc_nlp_in_use=0
 ro.gps.agps_provider=1
Author	SHA1	Message	Date
matteo0026	b4387e0e1d	Revert "matisse-common: Use TARGET_SCREEN_DENSITY" This reverts commit `6f35c9ee0b`. Change-Id: I13574cf8ec2caa52a61cbe29f852032f30c1ff1c	2022-11-11 14:47:11 +01:00
matteo0026	04b63ffd19	Revert "matisse-common: Move hardware specific .rc files to /vendor/etc/init/hw" This reverts commit `0865c167cd`.	2022-02-08 15:41:08 +01:00
Paul Keith	a9584a5f63	matisse-common: Use sdfat for exfat and vfat Change-Id: I660c5b3008636a651a2812fe1739ff8a2ea845cb	2022-02-07 12:45:07 +01:00
matteo0026	c4c4a43ce4	Revert "matisse-common: Move fstab to vendor/etc" LOS 16 still requires fstab in root. This reverts commit `e66821e503`. Change-Id: Ibf889062ca1fa3d8637ff3004a62e351dc7acf59	2022-02-07 12:38:07 +01:00
matteo0026	84d932f3a0	matisse-common: fix more sepolicy Change-Id: I53471f0e9ba8f0f00dca848ee1544ce1f87bc4a3	2021-12-19 16:32:55 +01:00
matteo0026	fd20bb6c81	matisse-common: fix init for LOS 16 Change-Id: Ieb0c83a86ca45a862b48c0499e8d6e10f62c472b	2021-12-18 22:34:02 +01:00
matteo0026	d7abf1c5a2	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: I9169b0e0f712e6f78f4245c85d4f18593e0b7852	2021-10-13 20:09:41 +02:00
				`@ -0,0 +1 @@`
				`allow firmware_file rootfs:filesystem associate;`