Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1af9316e authored by Lukacs T. Berki's avatar Lukacs T. Berki
Browse files

Remove sort_bss_symbols_by_size. 

Its only use was removed in aosp/1717013.

Bug: 187928080
Test: Presubmits.
Change-Id: If6acbfe8ba21ec4dc34166768ba1bde3bb78123c
parent 07538bb5

cc/library.go

+0 −16
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ type LibraryProperties struct { 
		Check_all_apis *bool

	}



	// Order symbols in .bss section by their sizes.  Only useful for shared libraries.

	Sort_bss_symbols_by_size *bool



	// Inject boringssl hash into the shared library.  This is only intended for use by external/boringssl.

	Inject_bssl_hash *bool `android:"arch_variant"`
@@ -1342,19 +1339,6 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, 
	linkerDeps = append(linkerDeps, deps.SharedLibsDeps...)

	linkerDeps = append(linkerDeps, deps.LateSharedLibsDeps...)

	linkerDeps = append(linkerDeps, objs.tidyFiles...)



	if Bool(library.Properties.Sort_bss_symbols_by_size) && !library.buildStubs() {

		unsortedOutputFile := android.PathForModuleOut(ctx, "unsorted", fileName)

		transformObjToDynamicBinary(ctx, objs.objFiles, sharedLibs,

			deps.StaticLibs, deps.LateStaticLibs, deps.WholeStaticLibs,

			linkerDeps, deps.CrtBegin, deps.CrtEnd, false, builderFlags, unsortedOutputFile, implicitOutputs)



		symbolOrderingFile := android.PathForModuleOut(ctx, "unsorted", fileName+".symbol_order")

		symbolOrderingFlag := library.baseLinker.sortBssSymbolsBySize(ctx, unsortedOutputFile, symbolOrderingFile, builderFlags)

		builderFlags.localLdFlags += " " + symbolOrderingFlag

		linkerDeps = append(linkerDeps, symbolOrderingFile)

	}



	transformObjToDynamicBinary(ctx, objs.objFiles, sharedLibs,

		deps.StaticLibs, deps.LateStaticLibs, deps.WholeStaticLibs,

		linkerDeps, deps.CrtBegin, deps.CrtEnd, false, builderFlags, outputFile, implicitOutputs)

cc/linker.go

+0 −25
Original line number Diff line number Diff line
@@ -594,28 +594,3 @@ func (linker *baseLinker) injectVersionSymbol(ctx ModuleContext, in android.Path 
		},

	})

}
 


// Rule to generate .bss symbol ordering file.



var (

	_                   = pctx.SourcePathVariable("genSortedBssSymbolsPath", "build/soong/scripts/gen_sorted_bss_symbols.sh")

	genSortedBssSymbols = pctx.AndroidStaticRule("gen_sorted_bss_symbols",

		blueprint.RuleParams{

			Command:     "CLANG_BIN=${clangBin} $genSortedBssSymbolsPath ${in} ${out}",

			CommandDeps: []string{"$genSortedBssSymbolsPath", "${clangBin}/llvm-nm"},

		},

		"clangBin")

)



func (linker *baseLinker) sortBssSymbolsBySize(ctx ModuleContext, in android.Path, symbolOrderingFile android.ModuleOutPath, flags builderFlags) string {

	ctx.Build(pctx, android.BuildParams{

		Rule:        genSortedBssSymbols,

		Description: "generate bss symbol order " + symbolOrderingFile.Base(),

		Output:      symbolOrderingFile,

		Input:       in,

		Args: map[string]string{

			"clangBin": "${config.ClangBin}",

		},

	})

	return "-Wl,--symbol-ordering-file," + symbolOrderingFile.String()

}

scripts/gen_sorted_bss_symbols.sh

deleted100755 → 0
+0 −28
Original line number Diff line number Diff line 
#!/bin/bash -e



# Copyright 2019 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.



# Script to generate a symbol ordering file that sorts bss section symbols by

# their sizes.

# Inputs:

#  Environment:

#   CLANG_BIN: path to the clang bin directory

#  Arguments:

#   $1: Input ELF file

#   $2: Output symbol ordering file



set -o pipefail



${CLANG_BIN}/llvm-nm --size-sort $1 | awk '{if ($2 == "b" || $2 == "B") print $3}' > $2