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

Browse Source 
Test: m nothing
Change-Id: Ide032aa64bb1fee69969c5e007bee6643d475309
This commit is contained in:
Paul Duffin
2020-06-16 16:12:50 +01:00
parent 8f91f7d802
commit ed62b9cc2a
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 { for _, propertyInfo := range includeDirProperties {
// Calculate the base directory in the snapshot into which the files will be copied. // Calculate the base directory in the snapshot into which the files will be copied.
// lib.ArchType is "" for common properties. // 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 propertyName := propertyInfo.propertyName

18
sdk/cc_sdk_test.go
View File

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