From 521e326b6742bc5728da1266730d154b9e7bbee7 Mon Sep 17 00:00:00 2001 From: Nick Reuter Date: Thu, 27 Jun 2019 23:11:22 -0500 Subject: [PATCH] dre: convert to Evervolv Change-Id: I2f91bc02bc4bb4ab1dc3e96094631464f9b969bd --- AndroidProducts.mk | 2 +- BoardConfig.mk | 11 ++++++----- device.mk | 4 ++-- lineage.dependencies => ev.dependencies | 13 +++++++++---- lineage_dre.mk => ev_dre.mk | 8 ++++---- manifest_odm.xml | 2 +- .../SettingsProvider}/res/values/defaults.xml | 0 .../sdk/services}/res/res/values/config.xml | 0 .../hardware/oplus/doze/res/values/config.xml | 0 .../Aperture/app/src/main/res/values/config.xml | 0 .../android/dialer/callrecord/res/values/config.xml | 0 .../packages/apps/Settings/res/values/ev_config.xml | 0 12 files changed, 23 insertions(+), 17 deletions(-) rename lineage.dependencies => ev.dependencies (55%) rename lineage_dre.mk => ev_dre.mk (81%) rename {overlay-lineage/lineage-sdk/packages/LineageSettingsProvider => overlay-ev/evervolv/sdk/packages/SettingsProvider}/res/values/defaults.xml (100%) rename {overlay-lineage/lineage-sdk/lineage => overlay-ev/evervolv/sdk/services}/res/res/values/config.xml (100%) rename {overlay-lineage => overlay-ev}/hardware/oplus/doze/res/values/config.xml (100%) rename {overlay-lineage => overlay-ev}/packages/apps/Aperture/app/src/main/res/values/config.xml (100%) rename {overlay-lineage => overlay-ev}/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml (100%) rename overlay-lineage/packages/apps/Settings/res/values/lineage_config.xml => overlay-ev/packages/apps/Settings/res/values/ev_config.xml (100%) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index d353f4b..183bb48 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,7 +16,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_dre.mk \ - $(LOCAL_DIR)/lineage_dre.mk + $(LOCAL_DIR)/ev_dre.mk COMMON_LUNCH_CHOICES := \ aosp_dre-trunk_staging-user \ diff --git a/BoardConfig.mk b/BoardConfig.mk index 79003ce..9666342 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -79,10 +79,11 @@ TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH := /sys/class/oplus_chg/battery/mmi # HIDL DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ - hardware/oplus/vintf/device_framework_matrix.xml \ - hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \ - vendor/lineage/config/device_framework_matrix.xml -DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml + device/qcom/common/vendor_framework_compatibility_matrix.xml \ + hardware/evervolv/interfaces/compatibility_matrices/compatibility_matrix.evervolv.xml \ + hardware/lineage/interfaces/compatibility_matrices/compatibility_matrix.lineage.xml \ + hardware/oplus/vintf/device_framework_matrix.xml +DEVICE_MATRIX_FILE := device/qcom/common/compatibility_matrix.xml DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml ODM_MANIFEST_FILES := $(DEVICE_PATH)/manifest_odm.xml @@ -122,7 +123,7 @@ BOARD_USES_METADATA_PARTITION := true # Partitions BOARD_PRODUCTIMAGE_MINIMAL_PARTITION_RESERVED_SIZE := false --include vendor/lineage/config/BoardConfigReservedSize.mk +-include $(SRC_EVERVOLV_DIR)/build/target/board/BoardConfigReservedSize.mk BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296 BOARD_DTBOIMG_PARTITION_SIZE := 8388608 BOARD_USERDATAIMAGE_PARTITION_SIZE := 54429298688 diff --git a/device.mk b/device.mk index 553f51e..7930941 100644 --- a/device.mk +++ b/device.mk @@ -5,7 +5,7 @@ # # Add common definitions for Qualcomm -$(call inherit-product, hardware/qcom-caf/common/common.mk) +$(call inherit-product, device/qcom/common/common.mk) # AAPT PRODUCT_AAPT_CONFIG := normal @@ -337,7 +337,7 @@ PRODUCT_PACKAGES += \ # Touch PRODUCT_PACKAGES += \ - vendor.lineage.touch@1.0-service.oplus + vendor.evervolv.touch@1.0-service.oplus PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml diff --git a/lineage.dependencies b/ev.dependencies similarity index 55% rename from lineage.dependencies rename to ev.dependencies index ab2b304..c237b62 100644 --- a/lineage.dependencies +++ b/ev.dependencies @@ -1,10 +1,15 @@ [ - { + { "repository": "android_hardware_oplus", "target_path": "hardware/oplus" - }, - { + }, + { "repository": "android_kernel_oneplus_sm4350", "target_path": "kernel/oneplus/sm4350" - } + }, + { + "repository": "proprietary_vendor_oneplus_dre", + "target_path": "vendor/oneplus/dre", + "remote": "evervolv-gitlab" + } ] diff --git a/lineage_dre.mk b/ev_dre.mk similarity index 81% rename from lineage_dre.mk rename to ev_dre.mk index 03e9362..3b2009a 100644 --- a/lineage_dre.mk +++ b/ev_dre.mk @@ -13,12 +13,12 @@ TARGET_SCREEN_WIDTH := 1080 # Overlays DEVICE_PACKAGE_OVERLAYS += \ - $(LOCAL_PATH)/overlay-lineage + $(LOCAL_PATH)/overlay-ev -# Inherit some common Lineage stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) +# Inherit some common Evervolv stuff. +$(call inherit-product, $(SRC_EVERVOLV_DIR)/config/common_full_phone.mk) -PRODUCT_NAME := lineage_dre +PRODUCT_NAME := ev_dre PRODUCT_MODEL := DE2117 PRODUCT_GMS_CLIENTID_BASE := android-oneplus diff --git a/manifest_odm.xml b/manifest_odm.xml index 928a70b..4dd4e53 100644 --- a/manifest_odm.xml +++ b/manifest_odm.xml @@ -1,6 +1,6 @@ - vendor.lineage.touch + vendor.evervolv.touch hwbinder 1.0 diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/overlay-ev/evervolv/sdk/packages/SettingsProvider/res/values/defaults.xml similarity index 100% rename from overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml rename to overlay-ev/evervolv/sdk/packages/SettingsProvider/res/values/defaults.xml diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-ev/evervolv/sdk/services/res/res/values/config.xml similarity index 100% rename from overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml rename to overlay-ev/evervolv/sdk/services/res/res/values/config.xml diff --git a/overlay-lineage/hardware/oplus/doze/res/values/config.xml b/overlay-ev/hardware/oplus/doze/res/values/config.xml similarity index 100% rename from overlay-lineage/hardware/oplus/doze/res/values/config.xml rename to overlay-ev/hardware/oplus/doze/res/values/config.xml diff --git a/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml b/overlay-ev/packages/apps/Aperture/app/src/main/res/values/config.xml similarity index 100% rename from overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml rename to overlay-ev/packages/apps/Aperture/app/src/main/res/values/config.xml diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-ev/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml similarity index 100% rename from overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml rename to overlay-ev/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml diff --git a/overlay-lineage/packages/apps/Settings/res/values/lineage_config.xml b/overlay-ev/packages/apps/Settings/res/values/ev_config.xml similarity index 100% rename from overlay-lineage/packages/apps/Settings/res/values/lineage_config.xml rename to overlay-ev/packages/apps/Settings/res/values/ev_config.xml