diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 38eed06..ace9754 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_avicii.mk + $(LOCAL_DIR)/aosp_avicii.mk COMMON_LUNCH_CHOICES := \ - lineage_avicii-eng \ - lineage_avicii-user \ - lineage_avicii-userdebug + aosp_avicii-eng \ + aosp_avicii-user \ + aosp_avicii-userdebug diff --git a/BoardConfig.mk b/BoardConfig.mk index b5b34d8..0eb78a8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -89,7 +89,7 @@ TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/oplus:libudfps_extension.oplus DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ $(DEVICE_PATH)/device_framework_matrix.xml \ hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \ - vendor/lineage/config/device_framework_matrix.xml + vendor/aosp/config/device_framework_matrix.xml DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml ODM_MANIFEST_FILES := $(DEVICE_PATH)/manifest_odm.xml @@ -135,14 +135,6 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296 BOARD_DTBOIMG_PARTITION_SIZE := 25165824 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 100663296 BOARD_USERDATAIMAGE_PARTITION_SIZE := 236009631744 -ifneq ($(WITH_GMS),true) -BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT := -1 -BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 614400000 -BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT := -1 -BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 92160000 -BOARD_SYSTEM_EXTIMAGE_EXTFS_INODE_COUNT := -1 -BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 92160000 -endif BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -212,3 +204,6 @@ WPA_SUPPLICANT_VERSION := VER_0_8_X # Include the proprietary files BoardConfig. include vendor/oneplus/avicii/BoardConfigVendor.mk + +# Include the OnePlus Firmware +-include vendor/oneplus/firmware/BoardConfigVendor.mk diff --git a/aosp.dependencies b/aosp.dependencies new file mode 100644 index 0000000..ce321fc --- /dev/null +++ b/aosp.dependencies @@ -0,0 +1,24 @@ +[ + { + "repository": "hardware_oplus", + "target_path": "hardware/oplus", + "remote": "pixel" + }, + { + "repository": "kernel_oneplus_sm7250", + "target_path": "kernel/oneplus/sm7250", + "branch": "thirteen" + }, + { + "repository": "vendor_oneplus_avicii", + "target_path": "vendor/oneplus/avicii", + "branch": "thirteen", + "remote": "pixel-devices-blobs" + }, + { + "repository": "vendor_oneplus-firmware", + "target_path": "vendor/oneplus/firmware", + "branch": "thirteen", + "remote": "pixel-devices-blobs" + } +] diff --git a/lineage_avicii.mk b/aosp_avicii.mk similarity index 68% rename from lineage_avicii.mk rename to aosp_avicii.mk index 81d123d..8f146fc 100644 --- a/lineage_avicii.mk +++ b/aosp_avicii.mk @@ -11,23 +11,22 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Inherit from avicii device $(call inherit-product, device/oneplus/avicii/device.mk) -# Inherit some common Lineage stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) +# Inherit some common PixelExperience stuff. +$(call inherit-product, vendor/aosp/config/common_full_phone.mk) -PRODUCT_NAME := lineage_avicii +PRODUCT_NAME := aosp_avicii PRODUCT_DEVICE := avicii PRODUCT_MANUFACTURER := OnePlus PRODUCT_BRAND := OnePlus PRODUCT_MODEL := AC2003 +CUSTOM_DEVICE := Nord PRODUCT_SYSTEM_NAME := Nord PRODUCT_SYSTEM_DEVICE := Nord PRODUCT_GMS_CLIENTID_BASE := android-oneplus PRODUCT_BUILD_PROP_OVERRIDES += \ - PRIVATE_BUILD_DESC="Nord-user 12 RKQ1.211119.001 Q.202212051830:user release-keys" \ TARGET_DEVICE=$(PRODUCT_SYSTEM_DEVICE) \ TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME) -BUILD_FINGERPRINT := OnePlus/Nord/Nord:12/RKQ1.211119.001/Q.202212051830:user/release-keys diff --git a/device.mk b/device.mk index dd86ee3..edca7cc 100644 --- a/device.mk +++ b/device.mk @@ -313,7 +313,7 @@ PRODUCT_PACKAGES += \ $(call inherit-product, hardware/oplus/overlay/qssi/qssi.mk) DEVICE_PACKAGE_OVERLAYS += \ - $(LOCAL_PATH)/overlay-lineage + $(LOCAL_PATH)/overlay-aosp PRODUCT_ENFORCE_RRO_TARGETS := * PRODUCT_PACKAGES += \ @@ -342,6 +342,9 @@ PRODUCT_PACKAGES += \ libqti_vndfwk_detect.vendor \ libvndfwk_detect_jni.qti.vendor +# Quick Tap +TARGET_SUPPORTS_QUICK_TAP := true + # RIL PRODUCT_PACKAGES += \ android.hardware.radio@1.5.vendor \ diff --git a/lineage.dependencies b/lineage.dependencies deleted file mode 100644 index bb0b659..0000000 --- a/lineage.dependencies +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "repository": "android_hardware_oplus", - "target_path": "hardware/oplus" - }, - { - "repository": "android_kernel_oneplus_sm7250", - "target_path": "kernel/oneplus/sm7250" - } -] diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-aosp/frameworks/base/core/res/res/values/config.xml similarity index 95% rename from overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml rename to overlay-aosp/frameworks/base/core/res/res/values/config.xml index 37fb0e0..c6b4881 100644 --- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml +++ b/overlay-aosp/frameworks/base/core/res/res/values/config.xml @@ -13,13 +13,13 @@ /system_ext/app/KeyHandler/KeyHandler.apk - /system_ext/priv-app/LineageParts/LineageParts.apk + /system/system_ext/priv-app/TouchGestures/TouchGestures.apk org.lineageos.settings.device.KeyHandler - org.lineageos.lineageparts.gestures.KeyHandler + com.android.touch.gestures.KeyHandler