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

40
tools/compliance/conditionset_test.go
View File

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

10
tools/perf/benchmarks
View File

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

6
tools/releasetools/blockimgdiff.py
View File

@@ -230,7 +230,7 @@ class BlockImageDiff(object):
all the data in the specified range.
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
include_clobbered_blocks is True).
@@ -550,8 +550,8 @@ class BlockImageDiff(object):
# work around the eMMC issue observed on some devices, which may otherwise
# get starving for clean blocks and thus fail the update. (b/28347095)
all_tgt = RangeSet(data=(0, self.tgt.total_blocks))
all_tgt_minus_extended = all_tgt.subtract(self.tgt.extended)
new_dontcare = all_tgt_minus_extended.subtract(self.tgt.care_map)
all_tgt_strix_extended = all_tgt.subtract(self.tgt.extended)
new_dontcare = all_tgt_strix_extended.subtract(self.tgt.care_map)
erase_first = new_dontcare.subtract(self.touched_src_ranges)
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.
The identifier codes include:
- ' '(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
Args: