Revert "Use soong_cc_prebuilt.mk instead of prebuilt.mk for Soong cc modules"

This reverts commit e2874cd99d.

Reason for revert: broke mac builds
Bug: 113936524

Change-Id: Id0311d6b202b18e80953da632133548d56ed851a
This commit is contained in:
Colin Cross
2018-09-10 21:35:34 +00:00
parent e2874cd99d
commit cb9342eabd
9 changed files with 90 additions and 67 deletions

View File

@@ -19,24 +19,18 @@ import (
"fmt"
)
func getNdkStlFamily(m *Module) string {
family, _ := getNdkStlFamilyAndLinkType(m)
return family
}
func getNdkStlFamilyAndLinkType(m *Module) (string, string) {
func getNdkStlFamily(ctx android.ModuleContext, m *Module) string {
stl := m.stl.Properties.SelectedStl
switch stl {
case "ndk_libc++_shared":
return "libc++", "shared"
case "ndk_libc++_static":
return "libc++", "static"
case "ndk_libc++_shared", "ndk_libc++_static":
return "libc++"
case "ndk_system":
return "system", "shared"
return "system"
case "":
return "none", "none"
return "none"
default:
panic(fmt.Errorf("stl: %q is not a valid STL", stl))
ctx.ModuleErrorf("stl: %q is not a valid STL", stl)
return ""
}
}