Differentiate sdk snapshot include dir by os type am: ed62b9cc2a am: a7d4a055b4

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

Change-Id: I12ba49c8be85532d16feba3650fc1fc5e32be140
This commit is contained in:
Paul Duffin
2020-07-10 14:31:32 +00:00
committed by Automerger Merge Worker
2 changed files with 10 additions and 10 deletions

View File

@@ -234,7 +234,7 @@ func addPossiblyArchSpecificProperties(sdkModuleContext android.ModuleContext, b
for _, propertyInfo := range includeDirProperties {
// Calculate the base directory in the snapshot into which the files will be copied.
// lib.ArchType is "" for common properties.
targetDir := filepath.Join(libInfo.archType, propertyInfo.snapshotDir)
targetDir := filepath.Join(libInfo.OsPrefix(), libInfo.archType, propertyInfo.snapshotDir)
propertyName := propertyInfo.propertyName