Revert "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang"

Revert submission 3195358-ndk-libcxx

Reason for revert: Droidmonitor created revert due to b/356220894. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3195358-ndk-libcxx

Change-Id: Ic9cd3d30637d5ac187d3fc80b34d45083f37064e
This commit is contained in:
Liana Kazanova
2024-07-29 22:58:39 +00:00
committed by Gerrit Code Review
parent 5228aebbde
commit 08d5d260db
7 changed files with 196 additions and 32 deletions

View File

@@ -1028,6 +1028,13 @@ 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
@@ -1081,6 +1088,16 @@ 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()))
}
@@ -2735,6 +2752,10 @@ 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.
@@ -3904,6 +3925,7 @@ const (
headerLibrary
testBin // testBinary already declared
ndkLibrary
ndkPrebuiltStl
)
func (c *Module) typ() moduleType {
@@ -3942,6 +3964,8 @@ func (c *Module) typ() moduleType {
return sharedLibrary
} else if c.isNDKStubLibrary() {
return ndkLibrary
} else if c.IsNdkPrebuiltStl() {
return ndkPrebuiltStl
}
return unknownType
}