Merge "Skip MIPS headers when generating NDK prebuilts"
diff --git a/cc/ndk_headers.go b/cc/ndk_headers.go
index 0458fb6..bfbf0f5 100644
--- a/cc/ndk_headers.go
+++ b/cc/ndk_headers.go
@@ -18,6 +18,7 @@
"fmt"
"os"
"path/filepath"
+ "strings"
"github.com/google/blueprint"
@@ -119,6 +120,14 @@
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)
for _, header := range srcFiles {
installDir := getHeaderInstallDir(ctx, header, String(m.properties.From),