StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

strix

Browse Source
This commit is contained in:
shuixx
2025-07-14 03:14:39 +00:00
parent 732117171d
commit b276b5b5c7
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/core/version.mk
View File

@@ -1,6 +1,6 @@
ADDITIONAL_SYSTEM_PROPERTIES += \ ADDITIONAL_SYSTEM_PROPERTIES += \
ro.strix.build.date=$(BUILD_DATE) \ ro.strix.build.date=$(BUILD_DATE) \
ro.strix.fingerprint=$(ROM_FINGERPRINT) \ ro.strix.fingerprint=$(ROM_FINGERPRINT) \
ro.strix.version=$(MINUS_VERSION) \ ro.strix.version=$(STRIX_VERSION) \
ro.strix.device=$(MINUS_BUILD) \ ro.strix.device=$(STRIX_BUILD) \
ro.modversion=$(MINUS_VERSION) ro.modversion=$(STRIX_VERSION)

24
build/envsetup.sh
View File

@@ -10,11 +10,11 @@ function check_product()
return return
fi fi
if (echo -n $1 | grep -q -e "^strix_") ; then 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 else
MINUS_BUILD= STRIX_BUILD=
fi fi
export MINUS_BUILD export STRIX_BUILD
TARGET_PRODUCT=$1 \ TARGET_PRODUCT=$1 \
TARGET_RELEASE=$2 \ TARGET_RELEASE=$2 \
@@ -75,13 +75,13 @@ function eat()
echo "Waiting for device..." echo "Waiting for device..."
adb wait-for-device-recovery adb wait-for-device-recovery
echo "Found device" echo "Found device"
if (adb shell getprop ro.strix.device | grep -q "$MINUS_BUILD"); then if (adb shell getprop ro.strix.device | grep -q "$STRIX_BUILD"); then
echo "Rebooting to sideload for install" echo "Rebooting to sideload for install"
adb reboot sideload-auto-reboot adb reboot sideload-auto-reboot
adb wait-for-sideload adb wait-for-sideload
adb sideload $ZIPPATH adb sideload $ZIPPATH
else else
echo "The connected device does not appear to be $MINUS_BUILD, run away!" echo "The connected device does not appear to be $STRIX_BUILD, run away!"
fi fi
return $? return $?
else else
@@ -327,14 +327,14 @@ function installboot()
adb wait-for-device-recovery adb wait-for-device-recovery
adb root adb root
adb wait-for-device-recovery adb wait-for-device-recovery
if (adb shell getprop ro.strix.device | grep -q "$MINUS_BUILD"); if (adb shell getprop ro.strix.device | grep -q "$STRIX_BUILD");
then then
adb push $OUT/boot.img /cache/ adb push $OUT/boot.img /cache/
adb shell dd if=/cache/boot.img of=$PARTITION adb shell dd if=/cache/boot.img of=$PARTITION
adb shell rm -rf /cache/boot.img adb shell rm -rf /cache/boot.img
echo "Installation complete." echo "Installation complete."
else else
echo "The connected device does not appear to be $MINUS_BUILD, run away!" echo "The connected device does not appear to be $STRIX_BUILD, run away!"
fi fi
} }
@@ -365,14 +365,14 @@ function installrecovery()
adb wait-for-device-recovery adb wait-for-device-recovery
adb root adb root
adb wait-for-device-recovery adb wait-for-device-recovery
if (adb shell getprop ro.strix.device | grep -q "$MINUS_BUILD"); if (adb shell getprop ro.strix.device | grep -q "$STRIX_BUILD");
then then
adb push $OUT/recovery.img /cache/ adb push $OUT/recovery.img /cache/
adb shell dd if=/cache/recovery.img of=$PARTITION adb shell dd if=/cache/recovery.img of=$PARTITION
adb shell rm -rf /cache/recovery.img adb shell rm -rf /cache/recovery.img
echo "Installation complete." echo "Installation complete."
else else
echo "The connected device does not appear to be $MINUS_BUILD, run away!" echo "The connected device does not appear to be $STRIX_BUILD, run away!"
fi fi
} }
@@ -448,7 +448,7 @@ function dopush()
echo "Device Found." echo "Device Found."
fi fi
if (adb shell getprop ro.strix.device | grep -q "$MINUS_BUILD") || [ "$FORCE_PUSH" = "true" ]; if (adb shell getprop ro.strix.device | grep -q "$STRIX_BUILD") || [ "$FORCE_PUSH" = "true" ];
then then
# retrieve IP and PORT info if we're using a TCP connection # retrieve IP and PORT info if we're using a TCP connection
TCPIPPORT=$(adb devices \ TCPIPPORT=$(adb devices \
@@ -567,7 +567,7 @@ EOF
rm -f $OUT/.log rm -f $OUT/.log
return 0 return 0
else else
echo "The connected device does not appear to be $MINUS_BUILD, run away!" echo "The connected device does not appear to be $STRIX_BUILD, run away!"
fi fi
} }
@@ -587,7 +587,7 @@ function fixup_common_out_dir() {
common_out_dir=$(_get_build_var_cached OUT_DIR)/target/common common_out_dir=$(_get_build_var_cached OUT_DIR)/target/common
target_device=$(_get_build_var_cached TARGET_DEVICE) target_device=$(_get_build_var_cached TARGET_DEVICE)
common_target_out=common-${target_device} common_target_out=common-${target_device}
if [ ! -z $MINUS_FIXUP_COMMON_OUT ]; then if [ ! -z $STRIX_FIXUP_COMMON_OUT ]; then
if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then
mv ${common_out_dir} ${common_out_dir}-${target_device} mv ${common_out_dir} ${common_out_dir}-${target_device}
ln -s ${common_target_out} ${common_out_dir} ln -s ${common_target_out} ${common_out_dir}

12
build/tasks/bacon.mk
View File

@@ -16,14 +16,14 @@
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Minus OTA update package # Minus OTA update package
MINUS_TARGET_PACKAGE := $(PRODUCT_OUT)/MinusOS-$(MINUS_VERSION).zip STRIX_TARGET_PACKAGE := $(PRODUCT_OUT)/MinusOS-$(STRIX_VERSION).zip
SHA256 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/sha256sum SHA256 := prebuilts/build-tools/path/$(HOST_PREBUILT_TAG)/sha256sum
$(MINUS_TARGET_PACKAGE): $(INTERNAL_OTA_PACKAGE_TARGET) $(STRIX_TARGET_PACKAGE): $(INTERNAL_OTA_PACKAGE_TARGET)
$(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(MINUS_TARGET_PACKAGE) $(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(STRIX_TARGET_PACKAGE)
$(hide) $(SHA256) $(MINUS_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(MINUS_TARGET_PACKAGE).sha256sum $(hide) $(SHA256) $(STRIX_TARGET_PACKAGE) | sed "s|$(PRODUCT_OUT)/||" > $(STRIX_TARGET_PACKAGE).sha256sum
@echo "Package Complete: $(MINUS_TARGET_PACKAGE)" >&2 @echo "Package Complete: $(STRIX_TARGET_PACKAGE)" >&2
.PHONY: bacon .PHONY: bacon
bacon: $(MINUS_TARGET_PACKAGE) $(DEFAULT_GOAL) bacon: $(STRIX_TARGET_PACKAGE) $(DEFAULT_GOAL)

2
config/common.mk
View File

@@ -90,7 +90,7 @@ PRODUCT_RESTRICT_VENDOR_FILES := false
ifneq ($(TARGET_DISABLE_EPPE),true) ifneq ($(TARGET_DISABLE_EPPE),true)
# Require all requested packages to exist # Require all requested packages to exist
$(call enforce-product-packages-exist-internal,$(wildcard device/*/$(MINUS_BUILD)/$(TARGET_PRODUCT).mk),product_manifest.xml rild Calendar android.hidl.memory@1.0-impl.vendor vndk_apex_snapshot_package) $(call enforce-product-packages-exist-internal,$(wildcard device/*/$(STRIX_BUILD)/$(TARGET_PRODUCT).mk),product_manifest.xml rild Calendar android.hidl.memory@1.0-impl.vendor vndk_apex_snapshot_package)
endif endif
# Build Manifest # Build Manifest

26
config/version.mk
View File

@@ -1,17 +1,17 @@
MINUS_DATE_YEAR := $(shell date -u +%Y) STRIX_DATE_YEAR := $(shell date -u +%Y)
MINUS_DATE_MONTH := $(shell date -u +%m) STRIX_DATE_MONTH := $(shell date -u +%m)
MINUS_DATE_DAY := $(shell date -u +%d) STRIX_DATE_DAY := $(shell date -u +%d)
MINUS_DATE_HOUR := $(shell date -u +%H) STRIX_DATE_HOUR := $(shell date -u +%H)
MINUS_DATE_MINUTE := $(shell date -u +%M) STRIX_DATE_MINUTE := $(shell date -u +%M)
MINUS_BUILD_DATE_UTC := $(shell date -d '$(MINUS_DATE_YEAR)-$(MINUS_DATE_MONTH)-$(MINUS_DATE_DAY) $(MINUS_DATE_HOUR):$(MINUS_DATE_MINUTE) UTC' +%s) STRIX_BUILD_DATE_UTC := $(shell date -d '$(STRIX_DATE_YEAR)-$(STRIX_DATE_MONTH)-$(STRIX_DATE_DAY) $(STRIX_DATE_HOUR):$(STRIX_DATE_MINUTE) UTC' +%s)
MINUS_BUILD_DATE := $(MINUS_DATE_YEAR)$(MINUS_DATE_MONTH)$(MINUS_DATE_DAY)-$(MINUS_DATE_HOUR)$(MINUS_DATE_MINUTE) STRIX_BUILD_DATE := $(STRIX_DATE_YEAR)$(STRIX_DATE_MONTH)$(STRIX_DATE_DAY)-$(STRIX_DATE_HOUR)$(STRIX_DATE_MINUTE)
MINUS_PLATFORM_VERSION := 16.0 STRIX_PLATFORM_VERSION := 16.0
MINUS_VERSION := $(MINUS_BUILD)-$(MINUS_PLATFORM_VERSION)-$(MINUS_BUILD_DATE) STRIX_VERSION := $(STRIX_BUILD)-$(STRIX_PLATFORM_VERSION)-$(STRIX_BUILD_DATE)
MINUS_VERSION_PROP := Balsam STRIX_VERSION_PROP := Balsam
PRODUCT_SYSTEM_PROPERTIES += \ PRODUCT_SYSTEM_PROPERTIES += \
ro.strix.build.date=$(BUILD_DATE) \ ro.strix.build.date=$(BUILD_DATE) \
ro.strix.fingerprint=$(ROM_FINGERPRINT) \ ro.strix.fingerprint=$(ROM_FINGERPRINT) \
ro.strix.version=$(MINUS_VERSION_PROP) \ ro.strix.version=$(STRIX_VERSION_PROP) \
ro.strix.device=$(MINUS_BUILD) \ ro.strix.device=$(STRIX_BUILD) \
ro.modversion=$(MINUS_VERSION) ro.modversion=$(STRIX_VERSION)