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

Export Soong cc modules to Make using a new soong_cc_prebuilt.mk that
bypasses all of prebuilt_internal.mk, dynamic_binary.mk and binary.mk.
This also means that stripping is handled in Soong instead of Make.

Bug: 113936524
Test: m checkbuild
Change-Id: If9008c50920779048480f5eeeb0084f26006c998
This commit is contained in:
Colin Cross
2018-09-04 16:28:17 -07:00
parent 0f40a7527a
commit e2874cd99d
9 changed files with 67 additions and 90 deletions

View File

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