diff --git a/Android.mk b/Android.mk index 736dffe..54dc8f5 100644 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter RMX1901 RMX1851,$(TARGET_DEVICE)),) +ifneq ($(filter kunlun2,$(TARGET_DEVICE)),) include $(call all-makefiles-under,$(LOCAL_PATH)) include $(CLEAR_VARS) diff --git a/AndroidProducts.mk b/AndroidProducts.mk new file mode 100644 index 0000000..e775356 --- /dev/null +++ b/AndroidProducts.mk @@ -0,0 +1,2 @@ +PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/aosp_kunlun2.mk diff --git a/BoardConfigCommon.mk b/BoardConfig.mk similarity index 83% rename from BoardConfigCommon.mk rename to BoardConfig.mk index 58e01df..8af4bc4 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfig.mk @@ -1,6 +1,6 @@ -BOARD_VENDOR := realme +BOARD_VENDOR := lenovo -COMMON_PATH := device/realme/sdm710-common +DEVICE_PATH := device/lenovo/kunlun2 # Architecture TARGET_ARCH := arm64 @@ -28,8 +28,9 @@ BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_TAGS_OFFSET := 0x00000100 BOARD_RAMDISK_OFFSET := 0x01000000 BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb -TARGET_KERNEL_SOURCE := kernel/realme/sdm710 +TARGET_KERNEL_SOURCE := kernel/lenovo/kunlun2 TARGET_KERNEL_ARCH := arm64 +TARGET_KERNEL_CONFIG := sdm670-perf_defconfig KERNEL_TOOLCHAIN := $(shell pwd)/prebuilts/arm64-gcc/bin KERNEL_TOOLCHAIN_PREFIX := aarch64-elf- @@ -39,7 +40,7 @@ USE_XML_AUDIO_POLICY_CONF := 1 AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true # Bluetooth -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth # Camera TARGET_USES_QTI_CAMERA_DEVICE := true @@ -51,14 +52,14 @@ BOARD_CHARGER_ENABLE_SUSPEND := true TARGET_ENABLE_MEDIADRM_64 := true # Filesystem -TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs +TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs # FM BOARD_HAVE_QCOM_FM := true BOARD_HAS_QCA_FM_SOC := "cherokee" # HIDL -DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml +DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml # Power TARGET_TAP_TO_WAKE_NODE := "/proc/touchpanel/double_tap_enable" @@ -69,6 +70,7 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384 BOARD_FLASH_BLOCK_SIZE := 262144 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true TARGET_USERIMAGES_USE_EXT4 := true @@ -81,17 +83,17 @@ BOARD_ROOT_EXTRA_SYMLINKS := \ /vendor/firmware_mnt:/firmware # Recovery -TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/recovery.fstab +TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab # Releasetools -TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH) +TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH) # RIL TARGET_PROVIDES_QTI_TELEPHONY_JAR := true # Sepolicy # PRIVATE_EXCLUDE_BUILD_TEST := true -BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private +BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(DEVICE_PATH)/sepolicy/private BOARD_PLAT_PRIVATE_SEPOLICY_DIR += \ device/qcom/sepolicy/generic/private \ device/qcom/sepolicy/qva/private diff --git a/aosp.dependencies b/aosp.dependencies deleted file mode 100644 index 4d0078c..0000000 --- a/aosp.dependencies +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "repository": "packages_apps_PixelLiveWallpaper", - "target_path": "packages/apps/PixelLiveWallpaper", - "branch": "ten", - "remote": "pixel-gitlab" - }, - { - "repository" : "vendor_realme", - "target_path": "vendor/realme", - "branch": "ten" - }, - { - "repository": "kernel_realme_sdm710", - "target_path": "kernel/realme/sdm710", - "branch": "ten" - }, - { - "repository": "arter97/arm64-gcc", - "target_path": "prebuilts/arm64-gcc", - "branch": "master", - "remote": "github" - } -] diff --git a/aosp_kunlun2.mk b/aosp_kunlun2.mk new file mode 100644 index 0000000..52ddcfe --- /dev/null +++ b/aosp_kunlun2.mk @@ -0,0 +1,31 @@ +# +# Copyright (C) 2019 The PixelExperience 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. +# + +$(call inherit-product, $(LOCAL_PATH)/device.mk) + +TARGET_GAPPS_ARCH := arm64 + +# Inherit some common Lineage stuff +$(call inherit-product, vendor/aosp/config/common_full_phone.mk) + +# Device identifier. This must come after all inclusions. +PRODUCT_NAME := aosp_kunlun2 +PRODUCT_BRAND := lenovo +PRODUCT_DEVICE := kunlun2 +PRODUCT_MANUFACTURER := lenovo +PRODUCT_MODEL := Lenovo K10 Note + +PRODUCT_GMS_CLIENTID_BASE := android-lenovo diff --git a/sdm710.mk b/device.mk similarity index 95% rename from sdm710.mk rename to device.mk index bd53f72..792297e 100644 --- a/sdm710.mk +++ b/device.mk @@ -4,7 +4,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Get non-open-source specific aspects -$(call inherit-product-if-exists, vendor/realme/sdm710-common/sdm710-common-vendor.mk) +$(call inherit-product-if-exists, vendor/lenovo/kunlun2/kunlun2-vendor.mk) # Enable updating of APEXes $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) @@ -42,7 +42,7 @@ PRODUCT_PACKAGES += \ # Device-specific settings PRODUCT_PACKAGES += \ - RealmeParts + LenovoParts # Dex preopt PRODUCT_DEXPREOPT_SPEED_APPS += \ @@ -87,7 +87,7 @@ PRODUCT_COPY_FILES += \ # Lights PRODUCT_PACKAGES += \ - android.hardware.light@2.0-service.realme_sdm710 + android.hardware.light@2.0-service.lenovo_kunlun2 # Media PRODUCT_COPY_FILES += \ @@ -140,7 +140,7 @@ PRODUCT_PACKAGES += \ # USB PRODUCT_PACKAGES += \ - android.hardware.usb@1.0-service.realme_sdm710 + android.hardware.usb@1.0-service.lenovo_kunlun2 # WiFi PRODUCT_COPY_FILES += \ diff --git a/light/Android.mk b/light/Android.mk index ac25d98..3dfe20f 100644 --- a/light/Android.mk +++ b/light/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.light@2.0-service.realme_sdm710 +LOCAL_MODULE := android.hardware.light@2.0-service.lenovo_kunlun2 LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/bin @@ -14,7 +14,7 @@ LOCAL_SRC_FILES := \ Light.cpp LOCAL_REQUIRED_MODULES := \ - android.hardware.light@2.0-service.realme_sdm710.rc + android.hardware.light@2.0-service.lenovo_kunlun2.rc LOCAL_SHARED_LIBRARIES := \ libbase \ @@ -30,13 +30,13 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.light@2.0-service.realme_sdm710.rc +LOCAL_MODULE := android.hardware.light@2.0-service.lenovo_kunlun2.rc LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/init LOCAL_MODULE_STEM := android.hardware.light@2.0-service.rc -LOCAL_SRC_FILES := android.hardware.light@2.0-service.realme_sdm710.rc +LOCAL_SRC_FILES := android.hardware.light@2.0-service.lenovo_kunlun2.rc include $(BUILD_PREBUILT) diff --git a/light/android.hardware.light@2.0-service.realme_sdm710.rc b/light/android.hardware.light@2.0-service.lenovo_kunlun2.rc similarity index 100% rename from light/android.hardware.light@2.0-service.realme_sdm710.rc rename to light/android.hardware.light@2.0-service.lenovo_kunlun2.rc diff --git a/light/service.cpp b/light/service.cpp index 828c8f4..0725b75 100644 --- a/light/service.cpp +++ b/light/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.light@2.0-service.realme_sdm710" +#define LOG_TAG "android.hardware.light@2.0-service.lenovo_kunlun2" #include #include diff --git a/parts/Android.mk b/parts/Android.mk index 55ad701..0cae3d7 100644 --- a/parts/Android.mk +++ b/parts/Android.mk @@ -12,7 +12,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_PACKAGE_NAME := RealmeParts +LOCAL_PACKAGE_NAME := LenovoParts LOCAL_CERTIFICATE := platform LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVILEGED_MODULE := true diff --git a/parts/AndroidManifest.xml b/parts/AndroidManifest.xml index 846a541..cdebe92 100644 --- a/parts/AndroidManifest.xml +++ b/parts/AndroidManifest.xml @@ -42,7 +42,7 @@ + android:permission="LenovoDozeService">