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 01:42:42 +00:00
parent c6f5f40333
commit 732117171d
38 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/core/config.mk
View File

@@ -14,4 +14,4 @@
# limitations under the License.
# Rules for QCOM targets
include $(TOPDIR)vendor/minus/build/core/qcom_target.mk
include $(TOPDIR)vendor/strix/build/core/qcom_target.mk

2
build/core/definitions.mk
View File

@@ -6,4 +6,4 @@ $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
endef
# Include board/platform macros
include vendor/minus/build/core/utils.mk
include vendor/strix/build/core/utils.mk

8
build/core/version.mk
View File

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

18
build/envsetup.sh
View File

@@ -9,8 +9,8 @@ function check_product()
echo "Couldn't locate the top of the tree. Try setting TOP." >&2
return
fi
if (echo -n $1 | grep -q -e "^minus_") ; then
MINUS_BUILD=$(echo -n $1 | sed -e 's/^minus_//g')
if (echo -n $1 | grep -q -e "^strix_") ; then
MINUS_BUILD=$(echo -n $1 | sed -e 's/^strix_//g')
else
MINUS_BUILD=
fi
@@ -41,7 +41,7 @@ function breakfast()
{
target=$1
local variant=$2
source ${ANDROID_BUILD_TOP}/vendor/minus/vars/aosp_target_release
source ${ANDROID_BUILD_TOP}/vendor/strix/vars/aosp_target_release
if [ $# -eq 0 ]; then
# No arguments, so let's have the full menu
@@ -56,7 +56,7 @@ function breakfast()
variant="userdebug"
fi
lunch minus_$target-$aosp_target_release-$variant
lunch strix_$target-$aosp_target_release-$variant
fi
fi
return $?
@@ -67,7 +67,7 @@ alias bib=breakfast
function eat()
{
if [ "$OUT" ] ; then
ZIPPATH=`ls -tr "$OUT"/minus-*.zip | tail -1`
ZIPPATH=`ls -tr "$OUT"/strix-*.zip | tail -1`
if [ ! -f $ZIPPATH ] ; then
echo "Nothing to eat"
return 1
@@ -75,7 +75,7 @@ function eat()
echo "Waiting for device..."
adb wait-for-device-recovery
echo "Found device"
if (adb shell getprop ro.minus.device | grep -q "$MINUS_BUILD"); then
if (adb shell getprop ro.strix.device | grep -q "$MINUS_BUILD"); then
echo "Rebooting to sideload for install"
adb reboot sideload-auto-reboot
adb wait-for-sideload
@@ -327,7 +327,7 @@ function installboot()
adb wait-for-device-recovery
adb root
adb wait-for-device-recovery
if (adb shell getprop ro.minus.device | grep -q "$MINUS_BUILD");
if (adb shell getprop ro.strix.device | grep -q "$MINUS_BUILD");
then
adb push $OUT/boot.img /cache/
adb shell dd if=/cache/boot.img of=$PARTITION
@@ -365,7 +365,7 @@ function installrecovery()
adb wait-for-device-recovery
adb root
adb wait-for-device-recovery
if (adb shell getprop ro.minus.device | grep -q "$MINUS_BUILD");
if (adb shell getprop ro.strix.device | grep -q "$MINUS_BUILD");
then
adb push $OUT/recovery.img /cache/
adb shell dd if=/cache/recovery.img of=$PARTITION
@@ -448,7 +448,7 @@ function dopush()
echo "Device Found."
fi
if (adb shell getprop ro.minus.device | grep -q "$MINUS_BUILD") || [ "$FORCE_PUSH" = "true" ];
if (adb shell getprop ro.strix.device | grep -q "$MINUS_BUILD") || [ "$FORCE_PUSH" = "true" ];
then
# retrieve IP and PORT info if we're using a TCP connection
TCPIPPORT=$(adb devices \

16
build/soong/Android.bp
View File

@@ -1,8 +1,8 @@
// MinusOS soong configs
bootstrap_go_package {
name: "soong-minus-generator",
pkgPath: "minus/soong/generator",
name: "soong-strix-generator",
pkgPath: "strix/soong/generator",
deps: [
"blueprint",
"blueprint-pathtools",
@@ -17,11 +17,11 @@ bootstrap_go_package {
pluginFor: ["soong_build"],
}
minus_generator {
strix_generator {
name: "generated_kernel_includes",
// The headers make command
cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install && vendor/minus/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install && vendor/strix/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
// Directories that can be imported by a cc_* module generated_headers property
export_include_dirs: [
@@ -42,11 +42,11 @@ minus_generator {
],
}
minus_generator {
strix_generator {
name: "prebuilt_kernel_includes",
// The headers extract command
cmd: "mkdir -p $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && gzip -d < $(TARGET_PREBUILT_KERNEL_HEADERS) | tar -x -C $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && vendor/minus/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
cmd: "mkdir -p $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && gzip -d < $(TARGET_PREBUILT_KERNEL_HEADERS) | tar -x -C $(KERNEL_BUILD_OUT_PREFIX)$(genDir) && vendor/strix/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
// Directories that can be imported by a cc_* module generated_headers property
export_include_dirs: [
@@ -59,8 +59,8 @@ minus_generator {
}
bootstrap_go_package {
name: "soong-minus-mkdir",
pkgPath: "minus/soong/mkdir",
name: "soong-strix-mkdir",
pkgPath: "strix/soong/mkdir",
deps: [
"blueprint",
"blueprint-pathtools",

2
build/soong/bin/hmm
View File

@@ -1,4 +1,4 @@
function __print_minus_functions_help() {
function __print_strix_functions_help() {
cat <<EOF
Additional functions:
- brunch: Runs "breakfast" and "mka bacon" for the provided device target.

8
build/soong/generator/generator.go
View File

@@ -27,7 +27,7 @@ import (
)
func init() {
android.RegisterModuleType("minus_generator", GeneratorFactory)
android.RegisterModuleType("strix_generator", GeneratorFactory)
}
var String = proptools.String
@@ -203,12 +203,12 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if depRoot == "" {
depRoot = ctx.ModuleDir()
} else {
depRoot = minusExpandVariables(ctx, depRoot)
depRoot = strixExpandVariables(ctx, depRoot)
}
// Glob dep_files property
for _, dep_file := range g.properties.Dep_files {
dep_file = minusExpandVariables(ctx, dep_file)
dep_file = strixExpandVariables(ctx, dep_file)
globPath := filepath.Join(depRoot, dep_file)
paths, err := ctx.GlobWithDeps(globPath, nil)
if err != nil {
@@ -220,7 +220,7 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
}
cmd := minusExpandVariables(ctx, String(g.properties.Cmd))
cmd := strixExpandVariables(ctx, String(g.properties.Cmd))
rawCommand, err := android.Expand(cmd, func(name string) (string, error) {
switch name {

8
build/soong/generator/variables.go
View File

@@ -6,12 +6,12 @@ import (
"android/soong/android"
)
func minusExpandVariables(ctx android.ModuleContext, in string) string {
minusVars := ctx.Config().VendorConfig("minusVarsPlugin")
func strixExpandVariables(ctx android.ModuleContext, in string) string {
strixVars := ctx.Config().VendorConfig("strixVarsPlugin")
out, err := android.Expand(in, func(name string) (string, error) {
if minusVars.IsSet(name) {
return minusVars.String(name), nil
if strixVars.IsSet(name) {
return strixVars.String(name), nil
}
// This variable is not for us, restore what the original
// variable string will have looked like for an Expand

2
build/soong/mkdir/init.go
View File

@@ -18,7 +18,7 @@ import (
"android/soong/android"
)
var pctx = android.NewPackageContext("minus/soong/mkdir")
var pctx = android.NewPackageContext("strix/soong/mkdir")
func init() {
RegisterBuildComponents(android.InitRegistrationContext)

2
build/soong/mkdir/mkdir.go
View File

@@ -58,7 +58,7 @@ func (this *Mkdir) AndroidMkEntries() []android.AndroidMkEntries {
Class: "FAKE",
// Need at least one output file in order for this to take effect.
OutputFile: android.OptionalPathForPath(this.output),
Include: "vendor/minus/build/core/mkdir.mk",
Include: "vendor/strix/build/core/mkdir.mk",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
entries.SetString("LOCAL_SOONG_INSTALL_DIR", this.installDir.String())

14
build/tasks/kernel.mk
View File

@@ -366,7 +366,7 @@ endef
# $(7): partition image intermediates file list
# $(8): external dependency module intermediates dir
# Depmod requires a well-formed kernel version so 0.0 is used as a placeholder.
define build-image-kernel-modules-minus
define build-image-kernel-modules-strix
mkdir -p $(2)/lib/modules$(6)
cp $(1) $(2)/lib/modules$(6)
rm -rf $(4)
@@ -532,19 +532,19 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(KERNEL_MODULE
if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from SYSTEM_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \
done); \
[ $$? -ne 0 ] && exit 1; \
($(call build-image-kernel-modules-minus,$$gki_modules,$(SYSTEM_KERNEL_MODULES_OUT),$(SYSTEM_KERNEL_MODULE_MOUNTPOINT)/,$(SYSTEM_KERNEL_DEPMOD_STAGING_DIR),$(BOARD_SYSTEM_KERNEL_MODULES_LOAD),/$(GKI_SUFFIX),$(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST))) || exit "$$?"; \
($(call build-image-kernel-modules-strix,$$gki_modules,$(SYSTEM_KERNEL_MODULES_OUT),$(SYSTEM_KERNEL_MODULE_MOUNTPOINT)/,$(SYSTEM_KERNEL_DEPMOD_STAGING_DIR),$(BOARD_SYSTEM_KERNEL_MODULES_LOAD),/$(GKI_SUFFIX),$(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST))) || exit "$$?"; \
filtered_modules=$$(for n in $$all_modules; do \
module_name=$$(basename $$n); \
if [[ ! "$(SYSTEM_KERNEL_MODULES)" =~ "$$module_name" ]]; then echo $$n; fi; \
done); \
($(call build-image-kernel-modules-minus,$$filtered_modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_KERNEL_MODULES_LOAD),,$(KERNEL_MODULES_PARTITION_FILE_LIST),$(SYSTEM_KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(SYSTEM_KERNEL_MODULE_MOUNTPOINT))) || exit "$$?"; \
($(call build-image-kernel-modules-strix,$$filtered_modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_KERNEL_MODULES_LOAD),,$(KERNEL_MODULES_PARTITION_FILE_LIST),$(SYSTEM_KERNEL_DEPMOD_STAGING_DIR)/lib/modules/0.0/$(SYSTEM_KERNEL_MODULE_MOUNTPOINT))) || exit "$$?"; \
(for m in $$(find $(SYSTEM_KERNEL_MODULES_OUT) -type f -name "*.ko"); do \
$(KERNEL_OUT)/scripts/sign-file sha1 \
$(KERNEL_OUT)/certs/signing_key.pem \
$(KERNEL_OUT)/certs/signing_key.x509 "$$m"; \
done) || exit "$$?"; \
,\
($(call build-image-kernel-modules-minus,$$all_modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_KERNEL_MODULES_LOAD),,$(KERNEL_MODULES_PARTITION_FILE_LIST),)) || exit "$$?"; \
($(call build-image-kernel-modules-strix,$$all_modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_KERNEL_MODULES_LOAD),,$(KERNEL_MODULES_PARTITION_FILE_LIST),)) || exit "$$?"; \
) \
$(if $(BOOT_KERNEL_MODULES),\
vendor_boot_modules=$$(for m in $(BOOT_KERNEL_MODULES); do \
@@ -552,7 +552,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(KERNEL_MODULE
if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from BOOT_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \
done); \
[ $$? -ne 0 ] && exit 1; \
($(call build-image-kernel-modules-minus,$$vendor_boot_modules,$(KERNEL_VENDOR_RAMDISK_MODULES_OUT),,$(KERNEL_VENDOR_RAMDISK_DEPMOD_STAGING_DIR),$(KERNEL_VENDOR_RAMDISK_KERNEL_MODULES_LOAD),,)) || exit "$$?"; \
($(call build-image-kernel-modules-strix,$$vendor_boot_modules,$(KERNEL_VENDOR_RAMDISK_MODULES_OUT),,$(KERNEL_VENDOR_RAMDISK_DEPMOD_STAGING_DIR),$(KERNEL_VENDOR_RAMDISK_KERNEL_MODULES_LOAD),,)) || exit "$$?"; \
) \
$(if $(RECOVERY_KERNEL_MODULES),\
recovery_modules=$$(for m in $(RECOVERY_KERNEL_MODULES); do \
@@ -560,7 +560,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(KERNEL_MODULE
if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from RECOVERY_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \
done); \
[ $$? -ne 0 ] && exit 1; \
($(call build-image-kernel-modules-minus,$$recovery_modules,$(KERNEL_RECOVERY_MODULES_OUT),,$(KERNEL_RECOVERY_DEPMOD_STAGING_DIR),$(BOARD_RECOVERY_KERNEL_MODULES_LOAD),,,)) || exit "$$?"; \
($(call build-image-kernel-modules-strix,$$recovery_modules,$(KERNEL_RECOVERY_MODULES_OUT),,$(KERNEL_RECOVERY_DEPMOD_STAGING_DIR),$(BOARD_RECOVERY_KERNEL_MODULES_LOAD),,,)) || exit "$$?"; \
) \
fi
@@ -662,7 +662,7 @@ ifeq ($(BOARD_USES_QCOM_MERGE_DTBS_SCRIPT),true)
$(hide) find $(DTBS_BASE) -type f -name "*.dtb*" | xargs rm -f
$(hide) find $(DTBS_OUT) -type f -name "*.dtb*" | xargs rm -f
mv $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/*/*.dtb $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/*/*.dtbo $(DTBS_BASE)/
PATH=$(abspath $(HOST_OUT_EXECUTABLES)):$${PATH} python3 $(BUILD_TOP)/vendor/minus/build/tools/merge_dtbs.py --base $(DTBS_BASE) --techpack $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom --out $(DTBS_OUT)
PATH=$(abspath $(HOST_OUT_EXECUTABLES)):$${PATH} python3 $(BUILD_TOP)/vendor/strix/build/tools/merge_dtbs.py --base $(DTBS_BASE) --techpack $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom --out $(DTBS_OUT)
cat $(shell find $(DTBS_OUT) -type f -name "${TARGET_MERGE_DTBS_WILDCARD}.dtb" | sort) > $@
else
cat $(shell find $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtb" | sort) > $@

40
charger/Android.mk
View File

@@ -16,89 +16,89 @@
LOCAL_PATH := $(call my-dir)
# Set minus_charger_density to the density bucket of the device.
minus_charger_density := mdpi
# Set strix_charger_density to the density bucket of the device.
strix_charger_density := mdpi
ifneq (,$(TARGET_SCREEN_DENSITY))
minus_charger_density := $(strip \
strix_charger_density := $(strip \
$(or $(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 560))),1),xxxhdpi),\
$(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 400))),1),xxhdpi),\
$(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 280))),1),xhdpi),\
$(if $(filter $(shell echo $$(($(TARGET_SCREEN_DENSITY) >= 200))),1),hdpi,mdpi)))
else ifneq (,$(filter mdpi hdpi xhdpi xxhdpi xxxhdpi,$(PRODUCT_AAPT_PREF_CONFIG)))
# If PRODUCT_AAPT_PREF_CONFIG includes a dpi bucket, then use that value.
minus_charger_density := $(PRODUCT_AAPT_PREF_CONFIG)
strix_charger_density := $(PRODUCT_AAPT_PREF_CONFIG)
endif
include $(CLEAR_VARS)
LOCAL_MODULE := minus_charger_battery_scale
LOCAL_MODULE := strix_charger_battery_scale
LOCAL_MODULE_STEM := battery_scale.png
LOCAL_SRC_FILES := $(minus_charger_density)/battery_scale.png
LOCAL_SRC_FILES := $(strix_charger_density)/battery_scale.png
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/images/charger
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := minus_charger_battery_scale_vendor
LOCAL_MODULE := strix_charger_battery_scale_vendor
LOCAL_MODULE_STEM := battery_scale.png
LOCAL_SRC_FILES := $(minus_charger_density)/battery_scale.png
LOCAL_SRC_FILES := $(strix_charger_density)/battery_scale.png
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/images/charger
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := minus_charger_battery_fail
LOCAL_MODULE := strix_charger_battery_fail
LOCAL_MODULE_STEM := battery_fail.png
LOCAL_SRC_FILES := $(minus_charger_density)/battery_fail.png
LOCAL_SRC_FILES := $(strix_charger_density)/battery_fail.png
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/images/charger
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := minus_charger_battery_fail_vendor
LOCAL_MODULE := strix_charger_battery_fail_vendor
LOCAL_MODULE_STEM := battery_fail.png
LOCAL_SRC_FILES := $(minus_charger_density)/battery_fail.png
LOCAL_SRC_FILES := $(strix_charger_density)/battery_fail.png
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/images/charger
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := minus_charger_font
LOCAL_MODULE := strix_charger_font
LOCAL_MODULE_STEM := percent_font.png
LOCAL_SRC_FILES := $(minus_charger_density)/percent_font.png
LOCAL_SRC_FILES := $(strix_charger_density)/percent_font.png
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/images/charger
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := minus_charger_font_vendor
LOCAL_MODULE := strix_charger_font_vendor
LOCAL_MODULE_STEM := percent_font.png
LOCAL_SRC_FILES := $(minus_charger_density)/percent_font.png
LOCAL_SRC_FILES := $(strix_charger_density)/percent_font.png
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/images/charger
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := minus_charger_animation
LOCAL_MODULE := strix_charger_animation
LOCAL_MODULE_STEM := animation.txt
LOCAL_SRC_FILES := animation.txt
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/res/values/charger
LOCAL_REQUIRED_MODULES := minus_charger_battery_scale minus_charger_battery_fail minus_charger_font
LOCAL_REQUIRED_MODULES := strix_charger_battery_scale strix_charger_battery_fail strix_charger_font
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := minus_charger_animation_vendor
LOCAL_MODULE := strix_charger_animation_vendor
LOCAL_MODULE_STEM := animation.txt
LOCAL_SRC_FILES := animation.txt
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/res/values/charger
LOCAL_REQUIRED_MODULES := minus_charger_battery_scale_vendor minus_charger_battery_fail_vendor minus_charger_font_vendor
LOCAL_REQUIRED_MODULES := strix_charger_battery_scale_vendor strix_charger_battery_fail_vendor strix_charger_font_vendor
include $(BUILD_PREBUILT)

4
config/BoardConfigMinus.mk
View File

@@ -4,10 +4,10 @@
# Recovery
BOARD_USES_FULL_RECOVERY_IMAGE ?= true
include vendor/minus/config/BoardConfigKernel.mk
include vendor/strix/config/BoardConfigKernel.mk
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
include hardware/qcom-caf/common/BoardConfigQcom.mk
endif
include vendor/minus/config/BoardConfigSoong.mk
include vendor/strix/config/BoardConfigSoong.mk

4
config/BoardConfigSoong.mk
View File

@@ -16,5 +16,5 @@ EXPORT_TO_SOONG := \
# Documentation here:
# https://github.com/LineageOS/android_build_soong/commit/8328367c44085b948c003116c0ed74a047237a69
$(call add_soong_config_namespace,minusVarsPlugin)
$(foreach v,$(EXPORT_TO_SOONG),$(eval $(call add_soong_config_var,minusVarsPlugin,$(v))))
$(call add_soong_config_namespace,strixVarsPlugin)
$(foreach v,$(EXPORT_TO_SOONG),$(eval $(call add_soong_config_var,strixVarsPlugin,$(v))))

14
config/aosp_audio.mk
View File

@@ -24,13 +24,13 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/alarms/ogg/Barium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Barium.ogg \
$(LOCAL_PATH)/alarms/ogg/Hassium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Hassium.ogg \
$(LOCAL_PATH)/alarms/ogg/Scandium.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Scandium.ogg \
vendor/minus/prebuilt/common/media/audio/alarms/Argon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon-old.ogg \
vendor/minus/prebuilt/common/media/audio/alarms/Carbon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon-old.ogg \
vendor/minus/prebuilt/common/media/audio/alarms/Krypton-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton-old.ogg \
vendor/minus/prebuilt/common/media/audio/alarms/Neon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon-old.ogg \
vendor/minus/prebuilt/common/media/audio/alarms/Osmium-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium-old.ogg \
vendor/minus/prebuilt/common/media/audio/alarms/Oxygen-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen-old.ogg \
vendor/minus/prebuilt/common/media/audio/alarms/Platinum-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum-old.ogg
vendor/strix/prebuilt/common/media/audio/alarms/Argon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Argon-old.ogg \
vendor/strix/prebuilt/common/media/audio/alarms/Carbon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Carbon-old.ogg \
vendor/strix/prebuilt/common/media/audio/alarms/Krypton-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Krypton-old.ogg \
vendor/strix/prebuilt/common/media/audio/alarms/Neon-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Neon-old.ogg \
vendor/strix/prebuilt/common/media/audio/alarms/Osmium-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Osmium-old.ogg \
vendor/strix/prebuilt/common/media/audio/alarms/Oxygen-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Oxygen-old.ogg \
vendor/strix/prebuilt/common/media/audio/alarms/Platinum-old.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Platinum-old.ogg
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/F1_New_SMS.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/F1_New_SMS.ogg \

34
config/common.mk
View File

@@ -29,18 +29,18 @@ endif
# Backup Tool
PRODUCT_COPY_FILES += \
vendor/minus/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
vendor/minus/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
vendor/minus/prebuilt/common/bin/50-minus.sh:$(TARGET_COPY_OUT_SYSTEM)/addon.d/50-minus.sh
vendor/strix/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
vendor/strix/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
vendor/strix/prebuilt/common/bin/50-strix.sh:$(TARGET_COPY_OUT_SYSTEM)/addon.d/50-strix.sh
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/addon.d/50-minus.sh
system/addon.d/50-strix.sh
ifneq ($(strip $(AB_OTA_PARTITIONS) $(AB_OTA_POSTINSTALL_CONFIG)),)
PRODUCT_COPY_FILES += \
vendor/minus/prebuilt/common/bin/backuptool_ab.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.sh \
vendor/minus/prebuilt/common/bin/backuptool_ab.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.functions \
vendor/minus/prebuilt/common/bin/backuptool_postinstall.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_postinstall.sh
vendor/strix/prebuilt/common/bin/backuptool_ab.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.sh \
vendor/strix/prebuilt/common/bin/backuptool_ab.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_ab.functions \
vendor/strix/prebuilt/common/bin/backuptool_postinstall.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool_postinstall.sh
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/bin/backuptool_ab.sh \
@@ -53,13 +53,13 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
endif
endif
# minus-specific broadcast actions whitelist
# strix-specific broadcast actions whitelist
PRODUCT_COPY_FILES += \
vendor/minus/config/permissions/minus-sysconfig.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/minus-sysconfig.xml
vendor/strix/config/permissions/strix-sysconfig.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/strix-sysconfig.xml
# minus-specific init rc file
# strix-specific init rc file
PRODUCT_COPY_FILES += \
vendor/minus/prebuilt/common/etc/init/init.minus-system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.minus-system_ext.rc
vendor/strix/prebuilt/common/etc/init/init.strix-system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.strix-system_ext.rc
# Enable SIP+VoIP on all targets
PRODUCT_COPY_FILES += \
@@ -125,7 +125,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
# FRP
PRODUCT_COPY_FILES += \
vendor/minus/prebuilt/common/bin/wipe-frp.sh:$(TARGET_COPY_OUT_RECOVERY)/root/system/bin/wipe-frp
vendor/strix/prebuilt/common/bin/wipe-frp.sh:$(TARGET_COPY_OUT_RECOVERY)/root/system/bin/wipe-frp
# Openssh
PRODUCT_PACKAGES += \
@@ -138,7 +138,7 @@ PRODUCT_PACKAGES += \
start-ssh
PRODUCT_COPY_FILES += \
vendor/minus/prebuilt/common/etc/init/init.openssh.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.openssh.rc
vendor/strix/prebuilt/common/etc/init/init.openssh.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/init.openssh.rc
# Storage manager
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
@@ -172,9 +172,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
setupwizard.theme=glif_v4 \
setupwizard.feature.day_night_mode_enabled=true
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/minus/overlay/no-rro
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/strix/overlay/no-rro
PRODUCT_PACKAGE_OVERLAYS += \
vendor/minus/overlay/common
vendor/strix/overlay/common
PRODUCT_PACKAGES += \
DocumentsUIOverlay \
@@ -188,9 +188,9 @@ CUSTOM_LOCALES += \
cy_GB \
fur_IT
include vendor/minus/config/version.mk
include vendor/strix/config/version.mk
-include vendor/minus-priv/keys/keys.mk
-include vendor/strix-priv/keys/keys.mk
-include $(WORKSPACE)/build_env/image-auto-bits.mk

8
config/common_full_foldable_book_telephony.mk
View File

@@ -1,13 +1,13 @@
# Inherit mobile full common MinusOS stuff
$(call inherit-product, vendor/minus/config/common_mobile_full.mk)
$(call inherit-product, vendor/strix/config/common_mobile_full.mk)
# Enable support of one-handed mode
PRODUCT_PRODUCT_PROPERTIES += \
ro.support_one_handed_mode?=true
# Inherit tablet common MinusOS stuff
$(call inherit-product, vendor/minus/config/tablet.mk)
$(call inherit-product, vendor/strix/config/tablet.mk)
$(call inherit-product, vendor/minus/config/telephony.mk)
$(call inherit-product, vendor/strix/config/telephony.mk)
PRODUCT_PACKAGE_OVERLAYS += vendor/minus/overlay/foldable_book
PRODUCT_PACKAGE_OVERLAYS += vendor/strix/overlay/foldable_book

4
config/common_full_phone.mk
View File

@@ -1,8 +1,8 @@
# Inherit mobile full common MinusOS stuff
$(call inherit-product, vendor/minus/config/common_mobile_full.mk)
$(call inherit-product, vendor/strix/config/common_mobile_full.mk)
# Enable support of one-handed mode
PRODUCT_PRODUCT_PROPERTIES += \
ro.support_one_handed_mode?=true
$(call inherit-product, vendor/minus/config/telephony.mk)
$(call inherit-product, vendor/strix/config/telephony.mk)

6
config/common_full_tablet.mk
View File

@@ -1,7 +1,7 @@
# Inherit mobile full common MinusOS
$(call inherit-product, vendor/minus/config/common_mobile_full.mk)
$(call inherit-product, vendor/strix/config/common_mobile_full.mk)
# Inherit tablet common MinusOS
$(call inherit-product, vendor/minus/config/tablet.mk)
$(call inherit-product, vendor/strix/config/tablet.mk)
$(call inherit-product, vendor/minus/config/telephony.mk)
$(call inherit-product, vendor/strix/config/telephony.mk)

6
config/common_full_tablet_wifionly.mk
View File

@@ -1,7 +1,7 @@
# Inherit mobile full common MinusOS
$(call inherit-product, vendor/minus/config/common_mobile_full.mk)
$(call inherit-product, vendor/strix/config/common_mobile_full.mk)
# Inherit tablet common MinusOS
$(call inherit-product, vendor/minus/config/tablet.mk)
$(call inherit-product, vendor/strix/config/tablet.mk)
$(call inherit-product, vendor/minus/config/wifionly.mk)
$(call inherit-product, vendor/strix/config/wifionly.mk)

4
config/common_mini_phone.mk
View File

@@ -1,4 +1,4 @@
# Inherit mobile mini common MinusOS
$(call inherit-product, vendor/minus/config/common_mobile_mini.mk)
$(call inherit-product, vendor/strix/config/common_mobile_mini.mk)
$(call inherit-product, vendor/minus/config/telephony.mk)
$(call inherit-product, vendor/strix/config/telephony.mk)

4
config/common_mobile.mk
View File

@@ -1,9 +1,9 @@
# Inherit common mobile MinusOS stuff
$(call inherit-product, vendor/minus/config/common.mk)
$(call inherit-product, vendor/strix/config/common.mk)
# Include AOSP audio files
$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage14.mk)
include vendor/minus/config/aosp_audio.mk
include vendor/strix/config/aosp_audio.mk
# Media
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \

2
config/common_mobile_full.mk
View File

@@ -1,5 +1,5 @@
# Inherit common Minus stuff
$(call inherit-product, vendor/minus/config/common_mobile.mk)
$(call inherit-product, vendor/strix/config/common_mobile.mk)
PRODUCT_SIZE := full

2
config/common_mobile_mini.mk
View File

@@ -1,4 +1,4 @@
# Inherit mini common Minus stuff
$(call inherit-product, vendor/minus/config/common_mobile.mk)
$(call inherit-product, vendor/strix/config/common_mobile.mk)
PRODUCT_SIZE := mini

6
config/minus_audio.mk
View File

@@ -2,9 +2,9 @@
# Minus Audio Files
#
ALARM_PATH := vendor/minus/prebuilt/common/media/audio/alarms
NOTIFICATION_PATH := vendor/minus/prebuilt/common/media/audio/notifications
RINGTONE_PATH := vendor/minus/prebuilt/common/media/audio/ringtones
ALARM_PATH := vendor/strix/prebuilt/common/media/audio/alarms
NOTIFICATION_PATH := vendor/strix/prebuilt/common/media/audio/notifications
RINGTONE_PATH := vendor/strix/prebuilt/common/media/audio/ringtones
# Alarms
PRODUCT_COPY_FILES += \

4
config/permissions/minus-sysconfig.xml → config/permissions/strix-sysconfig.xml
View File

@@ -19,7 +19,7 @@
<!-- Broadcast actions that are currently exempted from O+ background
delivery restrictions. -->
<allow-implicit-broadcast action="android.intent.action.CAMERA_BUTTON" />
<allow-implicit-broadcast action="minusos.intent.action.INITIALIZE_LINEAGE_HARDWARE" />
<allow-implicit-broadcast action="minusos.intent.action.LID_STATE_CHANGED" />
<allow-implicit-broadcast action="strixos.intent.action.INITIALIZE_LINEAGE_HARDWARE" />
<allow-implicit-broadcast action="strixos.intent.action.LID_STATE_CHANGED" />
</config>

2
config/tablet.mk
View File

@@ -5,4 +5,4 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.settings.large_screen_opt.enabled=true
# Tablet-specific overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/minus/overlay/tablet
PRODUCT_PACKAGE_OVERLAYS += vendor/strix/overlay/tablet

8
config/version.mk
View File

@@ -10,8 +10,8 @@ MINUS_VERSION := $(MINUS_BUILD)-$(MINUS_PLATFORM_VERSION)-$(MINUS_BUILD_DATE)
MINUS_VERSION_PROP := Balsam
PRODUCT_SYSTEM_PROPERTIES += \
ro.minus.build.date=$(BUILD_DATE) \
ro.minus.fingerprint=$(ROM_FINGERPRINT) \
ro.minus.version=$(MINUS_VERSION_PROP) \
ro.minus.device=$(MINUS_BUILD) \
ro.strix.build.date=$(BUILD_DATE) \
ro.strix.fingerprint=$(ROM_FINGERPRINT) \
ro.strix.version=$(MINUS_VERSION_PROP) \
ro.strix.device=$(MINUS_BUILD) \
ro.modversion=$(MINUS_VERSION)

2
config/wifionly.mk
View File

@@ -2,4 +2,4 @@
PRODUCT_PACKAGES += \
EmergencyInfo
PRODUCT_PACKAGE_OVERLAYS += vendor/minus/overlay/wifionly
PRODUCT_PACKAGE_OVERLAYS += vendor/strix/overlay/wifionly

2
prebuilt/common/bin/50-minus.sh → prebuilt/common/bin/50-strix.sh
View File

@@ -2,7 +2,7 @@
#
# ADDOND_VERSION=2
#
# /system/addon.d/50-minus.sh
# /system/addon.d/50-strix.sh
# During a MinusOS upgrade, this script backs up /system/etc/hosts,
# /system is formatted and reinstalled, then the file is restored.
#

2
prebuilt/common/bin/backuptool.sh
View File

@@ -48,7 +48,7 @@ if [ ! -r $S/build.prop ]; then
echo "Backup/restore is not possible. Partition is probably empty"
return 1
fi
if ! grep -q "^ro.minus.version=$V.*" $S/build.prop; then
if ! grep -q "^ro.strix.version=$V.*" $S/build.prop; then
echo "Backup/restore is not possible. Incompatible ROM version: $V"
return 2
fi

2
prebuilt/common/bin/backuptool_ab.sh
View File

@@ -56,7 +56,7 @@ if [ ! -r /system/build.prop ]; then
echo "Backup/restore is not possible. Partition is probably empty"
return 1
fi
if ! grep -q "^ro.minus.version=$V.*" /system/build.prop; then
if ! grep -q "^ro.strix.version=$V.*" /system/build.prop; then
echo "Backup/restore is not possible. Incompatible ROM version: $V"
return 2
fi

0
prebuilt/common/etc/init/init.minus-system_ext.rc → prebuilt/common/etc/init/init.strix-system_ext.rc
View File

2
prebuilt/common/etc/init/init.minus-updater.rc → prebuilt/common/etc/init/init.strix-updater.rc
View File

@@ -1,4 +1,4 @@
on post-fs-data
# Create an additional OTA package directory that unlike /data/ota_package
# will not be touched by GmsCore.
mkdir /data/minusos_updates 0770 system cache encryption=Require
mkdir /data/strixos_updates 0770 system cache encryption=Require

2
release/aconfig/bp2a/Android.bp
View File

@@ -1,5 +1,5 @@
aconfig_value_set {
name: "aconfig_value_set-minus-bp2a",
name: "aconfig_value_set-strix-bp2a",
values: [
"aconfig-values-bp2a-com.android.launcher3-all",
"aconfig-values-bp2a-com.android.settings.flags-all",

2
release/build_config/bp2a.textproto
View File

@@ -1,6 +1,6 @@
values: [
{
name: "RELEASE_ACONFIG_VALUE_SETS"
value: "aconfig_value_set-minus-bp2a"
value: "aconfig_value_set-strix-bp2a"
}
]

2
release/flag_declarations/Android.bp
View File

@@ -13,7 +13,7 @@
// limitations under the License.
build_flag_declarations {
name: "build_flags-build-release-minus",
name: "build_flags-build-release-strix",
srcs: [
"RELEASE_*.textproto",
],

2
release/release_configs/bp2a.textproto
View File

@@ -1,3 +1,3 @@
name: "bp2a"
inherits: "bp1a"
aconfig_value_sets: "aconfig_value_set-minus-bp2a"
aconfig_value_sets: "aconfig_value_set-strix-bp2a"