tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Whitelist system/apex/shim/build to use test_only_no_hashtree property"

Browse source 
am: 414f3a4c86

Change-Id: I82ad37b4d78ca2bd191da91baa51c1927c731540
This commit is contained in:
Nikita Ioffe 2020-01-03 03:33:45 -08:00 committed by android-build-merger
commit 830981c2ce
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apex/builder.go
View file

@ -378,7 +378,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
optFlags = append(optFlags, "--assets_dir "+filepath.Dir(noticeFile.String()))
}
if ctx.ModuleDir() != "system/apex/apexd/apexd_testdata" && a.testOnlyShouldSkipHashtreeGeneration() {
if ctx.ModuleDir() != "system/apex/apexd/apexd_testdata" && ctx.ModuleDir() != "system/apex/shim/build" && a.testOnlyShouldSkipHashtreeGeneration() {
ctx.PropertyErrorf("test_only_no_hashtree", "not available")
return
}