From 13395c3639e505009972bf3b1e05c3fb3d49dcd1 Mon Sep 17 00:00:00 2001 From: vjspranav Date: Sat, 26 Nov 2022 18:36:09 +0000 Subject: [PATCH] Stagify --- AndroidProducts.mk | 8 ++++---- BoardConfig.mk | 2 +- aosp.dependencies => stag.dependencies | 11 +++-------- aosp_miatoll.mk => stag_miatoll.mk | 4 ++-- 4 files changed, 10 insertions(+), 15 deletions(-) rename aosp.dependencies => stag.dependencies (70%) rename aosp_miatoll.mk => stag_miatoll.mk (91%) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 9537871..b56e4fe 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -5,9 +5,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/aosp_miatoll.mk + $(LOCAL_DIR)/stag_miatoll.mk COMMON_LUNCH_CHOICES := \ - aosp_miatoll-user \ - aosp_miatoll-userdebug \ - aosp_miatoll-eng + stag_miatoll-user \ + stag_miatoll-userdebug \ + stag_miatoll-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 8d42cdc..0af3603 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -174,7 +174,7 @@ ENABLE_VENDOR_RIL_SERVICE := true VENDOR_SECURITY_PATCH := 2022-06-05 # Sepolicy -include device/qcom/sepolicy_vndr/SEPolicy.mk +include device/qcom/sepolicy_vndr-legacy-um/SEPolicy.mk SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor diff --git a/aosp.dependencies b/stag.dependencies similarity index 70% rename from aosp.dependencies rename to stag.dependencies index 06225f9..719026f 100644 --- a/aosp.dependencies +++ b/stag.dependencies @@ -2,8 +2,6 @@ { "repository": "hardware_xiaomi", "target_path": "hardware/xiaomi", - "branch": "thirteen", - "remote": "pixel" }, { "repository": "LineageOS/android_kernel_xiaomi_sm6250", @@ -14,19 +12,16 @@ { "repository": "vendor_xiaomi_miatoll", "target_path": "vendor/xiaomi/miatoll", - "branch": "thirteen", - "remote": "pixel-devices-blobs" + "remote": "gitlab-stag" }, { "repository": "vendor_xiaomi_miatoll-fw", "target_path": "vendor/xiaomi/miatoll-fw", - "branch": "thirteen", - "remote": "pixel-devices-blobs" + "remote": "gitlab-stag" }, { "repository": "vendor_xiaomi_miatoll-gcam", "target_path": "vendor/xiaomi/miatoll-gcam", - "branch": "thirteen", - "remote": "pixel-devices-blobs" + "remote": "gitlab-stag" } ] diff --git a/aosp_miatoll.mk b/stag_miatoll.mk similarity index 91% rename from aosp_miatoll.mk rename to stag_miatoll.mk index edc4f42..5e95153 100644 --- a/aosp_miatoll.mk +++ b/stag_miatoll.mk @@ -9,7 +9,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Inherit some common Pixel Experience stuff. -$(call inherit-product, vendor/aosp/config/common_full_phone.mk) +$(call inherit-product, vendor/stag/main.mk) # Inherit from miatoll device $(call inherit-product, device/xiaomi/miatoll/device.mk) @@ -22,7 +22,7 @@ TARGET_GAPPS_ARCH := arm64 TARGET_SUPPORTS_QUICK_TAP := true TARGET_USES_AOSP_RECOVERY := true -PRODUCT_NAME := aosp_miatoll +PRODUCT_NAME := stag_miatoll PRODUCT_DEVICE := miatoll PRODUCT_MANUFACTURER := Xiaomi PRODUCT_BRAND := Redmi