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
diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go
new file mode 100644
index 0000000..f503982
--- /dev/null
+++ b/cc/ndk_prebuilt.go
@@ -0,0 +1,133 @@
+// Copyright 2016 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cc
+
+import (
+ "strings"
+
+ "android/soong/android"
+)
+
+func init() {
+ android.RegisterModuleType("ndk_prebuilt_static_stl", NdkPrebuiltStaticStlFactory)
+ android.RegisterModuleType("ndk_prebuilt_shared_stl", NdkPrebuiltSharedStlFactory)
+}
+
+// NDK prebuilt libraries.
+//
+// These differ from regular prebuilts in that they aren't stripped and usually aren't installed
+// either (with the exception of the shared STLs, which are installed to the app's directory rather
+// than to the system image).
+
+type ndkPrebuiltStlLinker struct {
+ *libraryDecorator
+}
+
+func (ndk *ndkPrebuiltStlLinker) linkerProps() []interface{} {
+ return append(ndk.libraryDecorator.linkerProps(), &ndk.Properties, &ndk.flagExporter.Properties)
+}
+
+func (*ndkPrebuiltStlLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
+ // NDK libraries can't have any dependencies
+ return deps
+}
+
+func (*ndkPrebuiltStlLinker) availableFor(what string) bool {
+ // ndk prebuilt objects are available to everywhere
+ return true
+}
+
+// ndk_prebuilt_shared_stl exports a precompiled ndk shared standard template
+// library (stl) library for linking operation. The soong's module name format
+// is ndk_<NAME>.so where the library is located under
+// ./prebuilts/ndk/current/sources/cxx-stl/llvm-libc++/libs/$(HOST_ARCH)/<NAME>.so.
+func NdkPrebuiltSharedStlFactory() android.Module {
+ module, library := NewLibrary(android.DeviceSupported)
+ library.BuildOnlyShared()
+ module.compiler = nil
+ module.linker = &ndkPrebuiltStlLinker{
+ libraryDecorator: library,
+ }
+ module.installer = nil
+ module.Properties.Sdk_version = StringPtr("minimum")
+ module.Properties.AlwaysSdk = true
+ module.stl.Properties.Stl = StringPtr("none")
+ return module.Init()
+}
+
+// ndk_prebuilt_static_stl exports a precompiled ndk static standard template
+// library (stl) library for linking operation. The soong's module name format
+// is ndk_<NAME>.a where the library is located under
+// ./prebuilts/ndk/current/sources/cxx-stl/llvm-libc++/libs/$(HOST_ARCH)/<NAME>.a.
+func NdkPrebuiltStaticStlFactory() android.Module {
+ module, library := NewLibrary(android.DeviceSupported)
+ library.BuildOnlyStatic()
+ module.compiler = nil
+ module.linker = &ndkPrebuiltStlLinker{
+ libraryDecorator: library,
+ }
+ module.installer = nil
+ module.Properties.Sdk_version = StringPtr("minimum")
+ module.Properties.HideFromMake = true
+ module.Properties.AlwaysSdk = true
+ module.Properties.Sdk_version = StringPtr("current")
+ module.stl.Properties.Stl = StringPtr("none")
+ return module.Init()
+}
+
+const (
+ libDir = "current/sources/cxx-stl/llvm-libc++/libs"
+)
+
+func getNdkStlLibDir(ctx android.ModuleContext) android.SourcePath {
+ return android.PathForSource(ctx, ctx.ModuleDir(), libDir).Join(ctx, ctx.Arch().Abi[0])
+}
+
+func (ndk *ndkPrebuiltStlLinker) link(ctx ModuleContext, flags Flags,
+ deps PathDeps, objs Objects) android.Path {
+ // A null build step, but it sets up the output path.
+ if !strings.HasPrefix(ctx.ModuleName(), "ndk_lib") {
+ ctx.ModuleErrorf("NDK prebuilt libraries must have an ndk_lib prefixed name")
+ }
+
+ ndk.libraryDecorator.flagExporter.exportIncludesAsSystem(ctx)
+
+ libName := strings.TrimPrefix(ctx.ModuleName(), "ndk_")
+ libExt := flags.Toolchain.ShlibSuffix()
+ if ndk.static() {
+ libExt = staticLibraryExtension
+ }
+
+ libDir := getNdkStlLibDir(ctx)
+ lib := libDir.Join(ctx, libName+libExt)
+
+ ndk.libraryDecorator.flagExporter.setProvider(ctx)
+
+ if ndk.static() {
+ depSet := android.NewDepSetBuilder[android.Path](android.TOPOLOGICAL).Direct(lib).Build()
+ android.SetProvider(ctx, StaticLibraryInfoProvider, StaticLibraryInfo{
+ StaticLibrary: lib,
+
+ TransitiveStaticLibrariesForOrdering: depSet,
+ })
+ } else {
+ android.SetProvider(ctx, SharedLibraryInfoProvider, SharedLibraryInfo{
+ SharedLibrary: lib,
+ Target: ctx.Target(),
+ })
+ }
+
+ return lib
+}