From 23979be87fb921c86b92a950402e662a23c576a1 Mon Sep 17 00:00:00 2001 From: shuixx Date: Mon, 14 Jul 2025 03:15:10 +0000 Subject: [PATCH] strix --- core/config.mk | 4 ++-- envsetup.sh | 6 +++--- target/product/aosp_product.mk | 4 ++-- target/product/base_system.mk | 2 +- target/product/full_base.mk | 2 +- target/product/full_base_telephony.mk | 2 +- target/product/handheld_product.mk | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/config.mk b/core/config.mk index a61d79c011..0b6ee9a98c 100644 --- a/core/config.mk +++ b/core/config.mk @@ -453,7 +453,7 @@ endif # See envsetup.mk for a description of SCAN_EXCLUDE_DIRS FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git) -ifneq ($(MINUS_BUILD),) +ifneq ($(STRIX_BUILD),) include vendor/strix/config/BoardConfigMinus.mk endif @@ -1299,7 +1299,7 @@ endif SOONG_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).variables SOONG_EXTRA_VARIABLES := $(SOONG_OUT_DIR)/soong.$(TARGET_PRODUCT)$(COVERAGE_SUFFIX).extra.variables -ifneq ($(MINUS_BUILD),) +ifneq ($(STRIX_BUILD),) ifneq ($(wildcard device/lineage/sepolicy/common/sepolicy.mk),) ## We need to be sure the global selinux policies are included ## last, to avoid accidental resetting by device configs diff --git a/envsetup.sh b/envsetup.sh index 2772a5daee..fd8b74175c 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -501,11 +501,11 @@ function lunch() function _lunch_meat() { if (echo -n $1 | grep -q -e "^strix_") ; then - MINUS_BUILD=$(echo -n $1 | sed -e 's/^strix_//g') + STRIX_BUILD=$(echo -n $1 | sed -e 's/^strix_//g') else - MINUS_BUILD= + STRIX_BUILD= fi - export MINUS_BUILD + export STRIX_BUILD local product=$1 local release=$2 diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk index 21f8a2edc4..d38e8eade2 100644 --- a/target/product/aosp_product.mk +++ b/target/product/aosp_product.mk @@ -19,7 +19,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk) # Default AOSP sounds -ifeq ($(MINUS_BUILD),) +ifeq ($(STRIX_BUILD),) $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) endif @@ -39,7 +39,7 @@ PRODUCT_PACKAGES += \ # Telephony: # Provide a APN configuration to GSI product -ifeq ($(MINUS_BUILD),) +ifeq ($(STRIX_BUILD),) PRODUCT_COPY_FILES += \ device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml endif diff --git a/target/product/base_system.mk b/target/product/base_system.mk index a8efffbade..11e2022974 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -515,7 +515,7 @@ PRODUCT_PACKAGES_DEBUG := \ unwind_reg_info \ unwind_symbols \ -ifeq ($(MINUS_BUILD),) +ifeq ($(STRIX_BUILD),) PRODUCT_PACKAGES_DEBUG += \ su endif diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 587797a7dc..46e1fb3689 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -45,7 +45,7 @@ PRODUCT_VENDOR_PROPERTIES := \ PRODUCT_LOCALES := en_US # Get some sounds -ifeq ($(MINUS_BUILD),) +ifeq ($(STRIX_BUILD),) $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) endif diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index 96c5beb7ec..717ecc4e3a 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -26,7 +26,7 @@ PRODUCT_VENDOR_PROPERTIES := \ PRODUCT_COPY_FILES := \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -ifeq ($(MINUS_BUILD),) +ifeq ($(STRIX_BUILD),) PRODUCT_COPY_FILES += \ device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml endif diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk index e673f82aea..07ba854375 100644 --- a/target/product/handheld_product.mk +++ b/target/product/handheld_product.mk @@ -32,7 +32,7 @@ PRODUCT_PACKAGES += \ SettingsIntelligence \ frameworks-base-overlays -ifeq ($(MINUS_BUILD),) +ifeq ($(STRIX_BUILD),) PRODUCT_PACKAGES += \ Camera2 \ LatinIME