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

Merge changes from topics "soong-inclusive-language", "soong_inclusive_language2" into rvc-dev am: f4a5492ec9

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

Change-Id: I1b009faacad99fcbfbf6cd06193f033ea37f6040
This commit is contained in:
Colin Cross
2020-06-16 03:43:15 +00:00
committed by Automerger Merge Worker
parent 3c76d01110 f4a5492ec9
commit e8f7f90496
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -1021,7 +1021,7 @@ type apexBundleProperties struct {
Uses []string
// A txt file containing list of files that are allowed to be included in this APEX.
Whitelisted_files *string
Allowed_files *string
// package format of this apex variant; could be non-flattened, flattened, or zip.
// imageApex, zipApex or flattened