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

Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix"

Browse Source
This commit is contained in:
Treehugger Robot
2021-01-21 14:34:37 +00:00
committed by Gerrit Code Review
parent ec7cab81f9 57621b29c4
commit d684e04247
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex_test.go
View File

@@ -5680,7 +5680,7 @@ func TestSymlinksFromApexToSystemRequiredModuleNames(t *testing.T) {
ensureNotContains(t, androidMk, "LOCAL_MODULE := prebuilt_myotherlib.myapex\n")
ensureNotContains(t, androidMk, "LOCAL_MODULE := myotherlib.myapex\n")
// `myapex` should have `myotherlib` in its required line, not `prebuilt_myotherlib`
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES += mylib.myapex myotherlib apex_manifest.pb.myapex apex_pubkey.myapex\n")
ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES += mylib.myapex:64 myotherlib:64 apex_manifest.pb.myapex apex_pubkey.myapex\n")
}
func TestApexWithJniLibs(t *testing.T) {