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

Merge "Skip MIPS headers when generating NDK prebuilts" am: f2a56f0e0d

Browse Source 
am: 29e5618645

Change-Id: I492e8ce51bae56d18c19e3232ba49be5db4e25b9
This commit is contained in:
Elliott Hughes
2017-11-28 23:45:01 +00:00
committed by android-build-merger
parent c86d1850c7 29e5618645
commit b9d8d85787
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/ndk_headers.go
View File

@@ -18,6 +18,7 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"github.com/google/blueprint" "github.com/google/blueprint"
@@ -119,6 +120,14 @@ func (m *headerModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
m.licensePath = android.PathForModuleSrc(ctx, String(m.properties.License)) m.licensePath = android.PathForModuleSrc(ctx, String(m.properties.License))
// When generating NDK prebuilts, skip installing MIPS headers,
// but keep them when doing regular platform build.
// Ndk_abis property is only set to true with build/soong/scripts/build-ndk-prebuilts.sh
// TODO: Revert this once MIPS is supported in NDK again.
if Bool(ctx.AConfig().Ndk_abis) && strings.Contains(ctx.ModuleName(), "mips") {
return
}
srcFiles := ctx.ExpandSources(m.properties.Srcs, nil) srcFiles := ctx.ExpandSources(m.properties.Srcs, nil)
for _, header := range srcFiles { for _, header := range srcFiles {
installDir := getHeaderInstallDir(ctx, header, String(m.properties.From), installDir := getHeaderInstallDir(ctx, header, String(m.properties.From),