Remove sort_bss_symbols_by_size.
Its only use was removed in aosp/1717013.
Bug: 187928080
Test: Presubmits.
Change-Id: If6acbfe8ba21ec4dc34166768ba1bde3bb78123c
diff --git a/cc/library.go b/cc/library.go
index 0ff78a5..c88c29a 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -111,9 +111,6 @@
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 @@
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)
diff --git a/cc/linker.go b/cc/linker.go
index 5bd21ed..1d8c649 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -594,28 +594,3 @@
},
})
}
-
-// 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()
-}
diff --git a/scripts/gen_sorted_bss_symbols.sh b/scripts/gen_sorted_bss_symbols.sh
deleted file mode 100755
index a9b61a1..0000000
--- a/scripts/gen_sorted_bss_symbols.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/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