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

Merge "Relax restriction on suffix of apex_set filename to include .capex" am: 385cde82d4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1821656

Change-Id: I91189bd060d0c365892234daab5a59b70a8018c7
This commit is contained in:
Mohammad Islam
2021-09-09 09:08:51 +00:00
committed by Automerger Merge Worker
parent c08fff0423 385cde82d4
commit 17544fe23a
5 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apex/apex_test.go
View File

@@ -4490,6 +4490,35 @@ func TestPrebuiltFilenameOverride(t *testing.T) {
}
}
func TestApexSetFilenameOverride(t *testing.T) {
testApex(t, `
apex_set {
name: "com.company.android.myapex",
apex_name: "com.android.myapex",
set: "company-myapex.apks",
filename: "com.company.android.myapex.apex"
}
`).ModuleForTests("com.company.android.myapex", "android_common_com.android.myapex")
testApex(t, `
apex_set {
name: "com.company.android.myapex",
apex_name: "com.android.myapex",
set: "company-myapex.apks",
filename: "com.company.android.myapex.capex"
}
`).ModuleForTests("com.company.android.myapex", "android_common_com.android.myapex")
testApexError(t, `filename should end in .apex or .capex for apex_set`, `
apex_set {
name: "com.company.android.myapex",
apex_name: "com.android.myapex",
set: "company-myapex.apks",
filename: "some-random-suffix"
}
`)
}
func TestPrebuiltOverrides(t *testing.T) {
ctx := testApex(t, `
prebuilt_apex {