Merge "Revert "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilt..."" into main (d49f0868) · Commits · e / os / android_build_soong

cc/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,6 @@ bootstrap_go_package {
		"ndk_abi.go",
		"ndk_headers.go",
		"ndk_library.go",
		"ndk_prebuilt.go",
		"ndk_sysroot.go",

		"llndk_library.go",

cc/androidmk.go

+0 −4

Original line number	Diff line number	Diff line
		@@ -451,10 +451,6 @@ func (c *vndkPrebuiltLibraryDecorator) AndroidMkEntries(ctx AndroidMkContext, en
		})
		}

		func (c ndkPrebuiltStlLinker) AndroidMkEntries(ctx AndroidMkContext, entries android.AndroidMkEntries) {
		entries.Class = "SHARED_LIBRARIES"
		}

		func (p prebuiltLinker) AndroidMkEntries(ctx AndroidMkContext, entries android.AndroidMkEntries) {
		entries.ExtraEntries = append(entries.ExtraEntries, func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
		if p.properties.Check_elf_files != nil {

cc/cc.go

+0 −24

Original line number	Diff line number	Diff line
		@@ -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()))
		}
		@@ -2754,10 +2737,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.
		@@ -3927,7 +3906,6 @@ const (
		headerLibrary
		testBin // testBinary already declared
		ndkLibrary
		ndkPrebuiltStl
		)

		func (c *Module) typ() moduleType {
		@@ -3966,8 +3944,6 @@ func (c *Module) typ() moduleType {
		return sharedLibrary
		} else if c.isNDKStubLibrary() {
		return ndkLibrary
		} else if c.IsNdkPrebuiltStl() {
		return ndkPrebuiltStl
		}
		return unknownType
		}

cc/cc_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -2760,7 +2760,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
		"external/foo/libarm",
		"external/foo/lib32",
		"external/foo/libandroid_arm",
		"defaults/cc/common/ndk_libc++_shared",
		"defaults/cc/common/ndk_libc++_shared_include_dirs",
		}

		conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"}

cc/ndk_prebuilt.go

deleted100644 → 0

+0 −133

Original line number	Diff line number	Diff line
		// 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
		}