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

Differentiate sdk snapshot include dir by os type am: ed62b9cc2a

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

Change-Id: I91a343fc2abb19a15fbe44112810010e055a954a
This commit is contained in:
Paul Duffin
2020-07-10 14:19:50 +00:00
committed by Automerger Merge Worker
parent 78498eb983 ed62b9cc2a
commit a7d4a055b4
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/library_sdk_member.go
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

18
sdk/cc_sdk_test.go
View File

@@ -1614,13 +1614,13 @@ cc_prebuilt_library_headers {
sdk_member_name: "mynativeheaders",
host_supported: true,
stl: "none",
export_system_include_dirs: ["include/include"],
export_system_include_dirs: ["common_os/include/include"],
target: {
android: {
export_include_dirs: ["include/include-android"],
export_include_dirs: ["android/include/include-android"],
},
linux_glibc: {
export_include_dirs: ["include/include-host"],
export_include_dirs: ["linux_glibc/include/include-host"],
},
},
}
@@ -1630,13 +1630,13 @@ cc_prebuilt_library_headers {
prefer: false,
host_supported: true,
stl: "none",
export_system_include_dirs: ["include/include"],
export_system_include_dirs: ["common_os/include/include"],
target: {
android: {
export_include_dirs: ["include/include-android"],
export_include_dirs: ["android/include/include-android"],
},
linux_glibc: {
export_include_dirs: ["include/include-host"],
export_include_dirs: ["linux_glibc/include/include-host"],
},
},
}
@@ -1648,9 +1648,9 @@ sdk_snapshot {
}
`),
checkAllCopyRules(`
include/Test.h -> include/include/Test.h
include-android/AndroidTest.h -> include/include-android/AndroidTest.h
include-host/HostTest.h -> include/include-host/HostTest.h
include/Test.h -> common_os/include/include/Test.h
include-android/AndroidTest.h -> android/include/include-android/AndroidTest.h
include-host/HostTest.h -> linux_glibc/include/include-host/HostTest.h
`),
)
}