Revert "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilt..."
Revert submission 3198506-revert-3195358-ndk-libcxx-UOZAIZERUU Reason for revert: reland topic Reverted changes: /q/submissionid:3198506-revert-3195358-ndk-libcxx-UOZAIZERUU Bug: http://b/332594828 Test: treehugger Change-Id: I9c11fd697cd35bdd1d6b679cb2e2fff239de272c
This commit is contained in:
24
cc/cc.go
24
cc/cc.go
@@ -1028,13 +1028,6 @@ func (c *Module) SelectedStl() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (c *Module) NdkPrebuiltStl() bool {
|
||||
if _, ok := c.linker.(*ndkPrebuiltStlLinker); ok {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (c *Module) StubDecorator() bool {
|
||||
if _, ok := c.linker.(*stubDecorator); ok {
|
||||
return true
|
||||
@@ -1088,16 +1081,6 @@ func (c *Module) CcLibraryInterface() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (c *Module) IsNdkPrebuiltStl() bool {
|
||||
if c.linker == nil {
|
||||
return false
|
||||
}
|
||||
if _, ok := c.linker.(*ndkPrebuiltStlLinker); ok {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (c *Module) RlibStd() bool {
|
||||
panic(fmt.Errorf("RlibStd called on non-Rust module: %q", c.BaseModuleName()))
|
||||
}
|
||||
@@ -2752,10 +2735,6 @@ func checkLinkType(ctx android.BaseModuleContext, from LinkableInterface, to Lin
|
||||
return
|
||||
}
|
||||
if c, ok := to.(*Module); ok {
|
||||
if c.NdkPrebuiltStl() {
|
||||
// These are allowed, but they don't set sdk_version
|
||||
return
|
||||
}
|
||||
if c.StubDecorator() {
|
||||
// These aren't real libraries, but are the stub shared libraries that are included in
|
||||
// the NDK.
|
||||
@@ -3925,7 +3904,6 @@ const (
|
||||
headerLibrary
|
||||
testBin // testBinary already declared
|
||||
ndkLibrary
|
||||
ndkPrebuiltStl
|
||||
)
|
||||
|
||||
func (c *Module) typ() moduleType {
|
||||
@@ -3964,8 +3942,6 @@ func (c *Module) typ() moduleType {
|
||||
return sharedLibrary
|
||||
} else if c.isNDKStubLibrary() {
|
||||
return ndkLibrary
|
||||
} else if c.IsNdkPrebuiltStl() {
|
||||
return ndkPrebuiltStl
|
||||
}
|
||||
return unknownType
|
||||
}
|
||||
|
Reference in New Issue
Block a user