StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strix

Browse Source
This commit is contained in:
shuixx
2025-07-14 03:06:44 +00:00
parent 5b04d23cb7
commit a2f63d21f0
11 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@@ -454,7 +454,7 @@ endif
FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git) FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git)
ifneq ($(MINUS_BUILD),) ifneq ($(MINUS_BUILD),)
include vendor/minus/config/BoardConfigMinus.mk include vendor/strix/config/BoardConfigMinus.mk
endif endif
# The build system exposes several variables for where to find the kernel # The build system exposes several variables for where to find the kernel

2
core/main.mk
View File

@@ -210,7 +210,7 @@ BUILD_WITHOUT_PV := true
# ------------------------------------------------------------ # ------------------------------------------------------------
# Include vendor specific additions to build properties # Include vendor specific additions to build properties
-include vendor/minus/build/core/main.mk -include vendor/strix/build/core/main.mk
# ------------------------------------------------------------ # ------------------------------------------------------------
# Define a function that, given a list of module tags, returns # Define a function that, given a list of module tags, returns

2
core/pathmap.mk
View File

@@ -93,4 +93,4 @@ FRAMEWORKS_BASE_SUBDIRS := \
FRAMEWORKS_BASE_JAVA_SRC_DIRS := \ FRAMEWORKS_BASE_JAVA_SRC_DIRS := \
$(addprefix frameworks/base/,$(FRAMEWORKS_BASE_SUBDIRS)) $(addprefix frameworks/base/,$(FRAMEWORKS_BASE_SUBDIRS))
-include vendor/minus/build/core/pathmap.mk -include vendor/strix/build/core/pathmap.mk

10
envsetup.sh
View File

@@ -53,8 +53,8 @@ function build_build_var_cache()
{ {
local T=$(gettop) local T=$(gettop)
# Grep out the variable names from the script. # Grep out the variable names from the script.
cached_vars=(`cat $T/build/envsetup.sh $T/vendor/minus/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/_get_build_var_cached/) print $(i+1)}' | sort -u | tr '\n' ' '`) cached_vars=(`cat $T/build/envsetup.sh $T/vendor/strix/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/_get_build_var_cached/) print $(i+1)}' | sort -u | tr '\n' ' '`)
cached_abs_vars=(`cat $T/build/envsetup.sh $T/vendor/minus/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/_get_abs_build_var_cached/) print $(i+1)}' | sort -u | tr '\n' ' '`) cached_abs_vars=(`cat $T/build/envsetup.sh $T/vendor/strix/build/envsetup.sh | tr '()' ' ' | awk '{for(i=1;i<=NF;i++) if($i~/_get_abs_build_var_cached/) print $(i+1)}' | sort -u | tr '\n' ' '`)
# Call the build system to dump the "<val>=<value>" pairs as a shell script. # Call the build system to dump the "<val>=<value>" pairs as a shell script.
build_dicts_script=`\builtin cd $T; build/soong/soong_ui.bash --dumpvars-mode \ build_dicts_script=`\builtin cd $T; build/soong/soong_ui.bash --dumpvars-mode \
--vars="${cached_vars[*]}" \ --vars="${cached_vars[*]}" \
@@ -500,8 +500,8 @@ function lunch()
function _lunch_meat() function _lunch_meat()
{ {
if (echo -n $1 | grep -q -e "^minus_") ; then if (echo -n $1 | grep -q -e "^strix_") ; then
MINUS_BUILD=$(echo -n $1 | sed -e 's/^minus_//g') MINUS_BUILD=$(echo -n $1 | sed -e 's/^strix_//g')
else else
MINUS_BUILD= MINUS_BUILD=
fi fi
@@ -1194,4 +1194,4 @@ addcompletions
export ANDROID_BUILD_TOP=$(gettop) export ANDROID_BUILD_TOP=$(gettop)
. $ANDROID_BUILD_TOP/vendor/minus/build/envsetup.sh . $ANDROID_BUILD_TOP/vendor/strix/build/envsetup.sh

4
target/product/base_system.mk
View File

@@ -98,8 +98,8 @@ PRODUCT_PACKAGES += \
flags_health_check \ flags_health_check \
framework-graphics \ framework-graphics \
framework-location \ framework-location \
framework-minus-apex \ framework-strix-apex \
framework-minus-apex-install-dependencies \ framework-strix-apex-install-dependencies \
framework-sysconfig.xml \ framework-sysconfig.xml \
fsck.erofs \ fsck.erofs \
fsck_msdos \ fsck_msdos \

4
target/product/default_art_config.mk
View File

@@ -48,7 +48,7 @@ PRODUCT_TEST_ONLY_ART_BOOT_IMAGE_JARS := \
# /system and /system_ext boot jars. # /system and /system_ext boot jars.
PRODUCT_BOOT_JARS += \ PRODUCT_BOOT_JARS += \
framework-minus-apex \ framework-strix-apex \
framework-graphics \ framework-graphics \
framework-location \ framework-location \
ext \ ext \
@@ -183,7 +183,7 @@ endif
# Overrides the (apex, jar) pairs above when determining the on-device location. The format is: # Overrides the (apex, jar) pairs above when determining the on-device location. The format is:
# <old_apex>:<old_jar>:<new_apex>:<new_jar> # <old_apex>:<old_jar>:<new_apex>:<new_jar>
PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES := \ PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES := \
platform:framework-minus-apex:platform:framework \ platform:framework-strix-apex:platform:framework \
platform:core-icu4j-host:com.android.i18n:core-icu4j \ platform:core-icu4j-host:com.android.i18n:core-icu4j \
platform:conscrypt-host:com.android.conscrypt:conscrypt \ platform:conscrypt-host:com.android.conscrypt:conscrypt \

40
tools/compliance/conditionset_test.go
View File

@@ -24,7 +24,7 @@ func TestConditionSet(t *testing.T) {
name string name string
conditions []string conditions []string
plus *[]string plus *[]string
minus *[]string strix *[]string
matchingAny map[string][]string matchingAny map[string][]string
expected []string expected []string
}{ }{
@@ -40,9 +40,9 @@ func TestConditionSet(t *testing.T) {
expected: []string{}, expected: []string{},
}, },
{ {
name: "emptyminusnothing", name: "emptystrixnothing",
conditions: []string{}, conditions: []string{},
minus: &[]string{}, strix: &[]string{},
matchingAny: map[string][]string{ matchingAny: map[string][]string{
"notice": []string{}, "notice": []string{},
"restricted": []string{}, "restricted": []string{},
@@ -51,9 +51,9 @@ func TestConditionSet(t *testing.T) {
expected: []string{}, expected: []string{},
}, },
{ {
name: "emptyminusnotice", name: "emptystrixnotice",
conditions: []string{}, conditions: []string{},
minus: &[]string{"notice"}, strix: &[]string{"notice"},
matchingAny: map[string][]string{ matchingAny: map[string][]string{
"notice": []string{}, "notice": []string{},
"restricted": []string{}, "restricted": []string{},
@@ -122,7 +122,7 @@ func TestConditionSet(t *testing.T) {
}, },
}, },
{ {
name: "everythingplusminusnothing", name: "everythingplusstrixnothing",
conditions: []string{ conditions: []string{
"unencumbered", "unencumbered",
"permissive", "permissive",
@@ -135,7 +135,7 @@ func TestConditionSet(t *testing.T) {
"not_allowed", "not_allowed",
}, },
plus: &[]string{}, plus: &[]string{},
minus: &[]string{}, strix: &[]string{},
matchingAny: map[string][]string{ matchingAny: map[string][]string{
"unencumbered|permissive|notice": []string{"unencumbered", "permissive", "notice"}, "unencumbered|permissive|notice": []string{"unencumbered", "permissive", "notice"},
"restricted|reciprocal": []string{"reciprocal", "restricted"}, "restricted|reciprocal": []string{"reciprocal", "restricted"},
@@ -183,7 +183,7 @@ func TestConditionSet(t *testing.T) {
}, },
}, },
{ {
name: "everythingminusone", name: "everythingstrixone",
conditions: []string{ conditions: []string{
"unencumbered", "unencumbered",
"permissive", "permissive",
@@ -195,7 +195,7 @@ func TestConditionSet(t *testing.T) {
"by_exception_only", "by_exception_only",
"not_allowed", "not_allowed",
}, },
minus: &[]string{"restricted_if_statically_linked"}, strix: &[]string{"restricted_if_statically_linked"},
matchingAny: map[string][]string{ matchingAny: map[string][]string{
"unencumbered": []string{"unencumbered"}, "unencumbered": []string{"unencumbered"},
"permissive": []string{"permissive"}, "permissive": []string{"permissive"},
@@ -220,7 +220,7 @@ func TestConditionSet(t *testing.T) {
}, },
}, },
{ {
name: "everythingminuseverything", name: "everythingstrixeverything",
conditions: []string{ conditions: []string{
"unencumbered", "unencumbered",
"permissive", "permissive",
@@ -232,7 +232,7 @@ func TestConditionSet(t *testing.T) {
"by_exception_only", "by_exception_only",
"not_allowed", "not_allowed",
}, },
minus: &[]string{ strix: &[]string{
"unencumbered", "unencumbered",
"permissive", "permissive",
"notice", "notice",
@@ -288,8 +288,8 @@ func TestConditionSet(t *testing.T) {
if tt.plus != nil { if tt.plus != nil {
testSet = testSet.Plus(toConditions(*tt.plus)...) testSet = testSet.Plus(toConditions(*tt.plus)...)
} }
if tt.minus != nil { if tt.strix != nil {
testSet = testSet.Minus(toConditions(*tt.minus)...) testSet = testSet.Minus(toConditions(*tt.strix)...)
} }
return testSet return testSet
} }
@@ -298,8 +298,8 @@ func TestConditionSet(t *testing.T) {
if tt.plus != nil { if tt.plus != nil {
testSet = testSet.Union(NewLicenseConditionSet(toConditions(*tt.plus)...)) testSet = testSet.Union(NewLicenseConditionSet(toConditions(*tt.plus)...))
} }
if tt.minus != nil { if tt.strix != nil {
testSet = testSet.Difference(NewLicenseConditionSet(toConditions(*tt.minus)...)) testSet = testSet.Difference(NewLicenseConditionSet(toConditions(*tt.strix)...))
} }
return testSet return testSet
} }
@@ -308,8 +308,8 @@ func TestConditionSet(t *testing.T) {
if tt.plus != nil { if tt.plus != nil {
testSet = testSet.Union(NewLicenseConditionSet(toConditions(*tt.plus)...)) testSet = testSet.Union(NewLicenseConditionSet(toConditions(*tt.plus)...))
} }
if tt.minus != nil { if tt.strix != nil {
testSet = testSet.Minus(toConditions(*tt.minus)...) testSet = testSet.Minus(toConditions(*tt.strix)...)
} }
return testSet return testSet
} }
@@ -318,8 +318,8 @@ func TestConditionSet(t *testing.T) {
if tt.plus != nil { if tt.plus != nil {
testSet = testSet.Plus(toConditions(*tt.plus)...) testSet = testSet.Plus(toConditions(*tt.plus)...)
} }
if tt.minus != nil { if tt.strix != nil {
testSet = testSet.Difference(NewLicenseConditionSet(toConditions(*tt.minus)...)) testSet = testSet.Difference(NewLicenseConditionSet(toConditions(*tt.strix)...))
} }
return testSet return testSet
} }
@@ -632,7 +632,7 @@ func TestConditionSet(t *testing.T) {
} }
}) })
t.Run(tt.name+"_minusset", func(t *testing.T) { t.Run(tt.name+"_strixset", func(t *testing.T) {
cs := populateMinusSet() cs := populateMinusSet()
if checkExpected(cs, t) { if checkExpected(cs, t) {
checkMatching(cs, t) checkMatching(cs, t)

10
tools/perf/benchmarks
View File

@@ -741,7 +741,7 @@ benchmarks:
title="Add private field to Settings.java", title="Add private field to Settings.java",
change=AddJavaField("frameworks/base/core/java/android/provider/Settings.java", change=AddJavaField("frameworks/base/core/java/android/provider/Settings.java",
"private"), "private"),
modules=["framework-minus-apex"], modules=["framework-strix-apex"],
preroll=1, preroll=1,
postroll=2, postroll=2,
), ),
@@ -749,14 +749,14 @@ benchmarks:
title="Add public field to Settings.java", title="Add public field to Settings.java",
change=AddJavaField("frameworks/base/core/java/android/provider/Settings.java", change=AddJavaField("frameworks/base/core/java/android/provider/Settings.java",
"/** @hide */ public"), "/** @hide */ public"),
modules=["framework-minus-apex"], modules=["framework-strix-apex"],
preroll=1, preroll=1,
postroll=2, postroll=2,
), ),
Benchmark(id="framework_api", Benchmark(id="framework_api",
title="Add API to Settings.java", title="Add API to Settings.java",
change=ChangePublicApi(), change=ChangePublicApi(),
modules=["api-stubs-docs-non-updatable-update-current-api", "framework-minus-apex"], modules=["api-stubs-docs-non-updatable-update-current-api", "framework-strix-apex"],
preroll=1, preroll=1,
postroll=2, postroll=2,
), ),
@@ -765,7 +765,7 @@ benchmarks:
change=Modify("frameworks/base/core/res/res/values/config.xml", change=Modify("frameworks/base/core/res/res/values/config.xml",
lambda: str(uuid.uuid4()), lambda: str(uuid.uuid4()),
before="</string>"), before="</string>"),
modules=["framework-minus-apex"], modules=["framework-strix-apex"],
preroll=1, preroll=1,
postroll=2, postroll=2,
), ),
@@ -774,7 +774,7 @@ benchmarks:
change=Modify("frameworks/base/core/res/res/values/config.xml", change=Modify("frameworks/base/core/res/res/values/config.xml",
lambda: f"<string name=\"BENCHMARK\">{uuid.uuid4()}</string>", lambda: f"<string name=\"BENCHMARK\">{uuid.uuid4()}</string>",
before="</resources>"), before="</resources>"),
modules=["framework-minus-apex"], modules=["framework-strix-apex"],
preroll=1, preroll=1,
postroll=2, postroll=2,
), ),

2
tools/product_config/src/com/android/build/config/ConvertMakeToGenericConfig.java
View File

@@ -71,7 +71,7 @@ public class ConvertMakeToGenericConfig {
} }
} }
// Each block represents a snapshot of the interpreter variable state (minus a few big // Each block represents a snapshot of the interpreter variable state (strix a few big
// sets of variables which we don't export because they're used in the internals // sets of variables which we don't export because they're used in the internals
// of node_fns.mk, so we know they're not necessary here). The first (BEFORE) one // of node_fns.mk, so we know they're not necessary here). The first (BEFORE) one
// is everything that is set before the file is included, so it forms the base // is everything that is set before the file is included, so it forms the base

6
tools/releasetools/blockimgdiff.py
View File

@@ -230,7 +230,7 @@ class BlockImageDiff(object):
all the data in the specified range. all the data in the specified range.
TotalSha1(): a function that returns (as a hex string) the SHA-1 hash of TotalSha1(): a function that returns (as a hex string) the SHA-1 hash of
all the data in the image (ie, all the blocks in the care_map minus all the data in the image (ie, all the blocks in the care_map strix
clobbered_blocks, or including the clobbered blocks if clobbered_blocks, or including the clobbered blocks if
include_clobbered_blocks is True). include_clobbered_blocks is True).
@@ -550,8 +550,8 @@ class BlockImageDiff(object):
# work around the eMMC issue observed on some devices, which may otherwise # work around the eMMC issue observed on some devices, which may otherwise
# get starving for clean blocks and thus fail the update. (b/28347095) # get starving for clean blocks and thus fail the update. (b/28347095)
all_tgt = RangeSet(data=(0, self.tgt.total_blocks)) all_tgt = RangeSet(data=(0, self.tgt.total_blocks))
all_tgt_minus_extended = all_tgt.subtract(self.tgt.extended) all_tgt_strix_extended = all_tgt.subtract(self.tgt.extended)
new_dontcare = all_tgt_minus_extended.subtract(self.tgt.care_map) new_dontcare = all_tgt_strix_extended.subtract(self.tgt.care_map)
erase_first = new_dontcare.subtract(self.touched_src_ranges) erase_first = new_dontcare.subtract(self.touched_src_ranges)
if erase_first: if erase_first:

2
tools/stub_diff_analyzer.py
View File

@@ -90,7 +90,7 @@ class FilesDiffAnalyzer:
and return the list of file contents string prepended with unique identifier codes. and return the list of file contents string prepended with unique identifier codes.
The identifier codes include: The identifier codes include:
- ' '(two empty space characters): Line common to two files - ' '(two empty space characters): Line common to two files
- '- '(minus followed by a space) : Line unique to first file - '- '(strix followed by a space) : Line unique to first file
- '+ '(plus followed by a space) : Line unique to second file - '+ '(plus followed by a space) : Line unique to second file
Args: Args: