Commit 2f8db3cc authored by Benoit Lize's avatar Benoit Lize Committed by Commit Bot

base/android: Remove linker tests rules.

Linker tests have been removed. Remove the build rules as well.

Bug: 1059707
Change-Id: If5e4d004026c2a86f79036a8457577e8104eadc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2104472Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Benoit L <lizeb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750543}
parent 88733983
...@@ -36,7 +36,6 @@ class LegacyLinker extends Linker { ...@@ -36,7 +36,6 @@ class LegacyLinker extends Linker {
void loadLibraryImplLocked(String library, boolean isFixedAddressPermitted) { void loadLibraryImplLocked(String library, boolean isFixedAddressPermitted) {
ensureInitializedLocked(); ensureInitializedLocked();
assert mState == State.INITIALIZED; // Only one successful call. assert mState == State.INITIALIZED; // Only one successful call.
assert !NativeLibraries.sEnableLinkerTests;
boolean provideRelro = mInBrowserProcess; boolean provideRelro = mInBrowserProcess;
long loadAddress = isFixedAddressPermitted ? mBaseLoadAddress : 0; long loadAddress = isFixedAddressPermitted ? mBaseLoadAddress : 0;
......
...@@ -18,7 +18,6 @@ public class NativeLibraries {{ ...@@ -18,7 +18,6 @@ public class NativeLibraries {{
// Set to true to enable the use of the Chromium Linker. // Set to true to enable the use of the Chromium Linker.
public static {MAYBE_FINAL}boolean sUseLinker{USE_LINKER}; public static {MAYBE_FINAL}boolean sUseLinker{USE_LINKER};
public static {MAYBE_FINAL}boolean sUseLibraryInZipFile{USE_LIBRARY_IN_ZIP_FILE}; public static {MAYBE_FINAL}boolean sUseLibraryInZipFile{USE_LIBRARY_IN_ZIP_FILE};
public static {MAYBE_FINAL}boolean sEnableLinkerTests{ENABLE_LINKER_TESTS};
public static {MAYBE_FINAL}boolean sUseModernLinker{USE_MODERN_LINKER}; public static {MAYBE_FINAL}boolean sUseModernLinker{USE_MODERN_LINKER};
// This is the list of native libraries to be loaded (in the correct order) // This is the list of native libraries to be loaded (in the correct order)
......
...@@ -35,8 +35,6 @@ def main(): ...@@ -35,8 +35,6 @@ def main():
'--load-library-from-apk', '--load-library-from-apk',
action='store_true', action='store_true',
help='Load libaries from APK without uncompressing.') help='Load libaries from APK without uncompressing.')
parser.add_argument(
'--enable-chromium-linker-tests', action='store_true', help='Run tests.')
parser.add_argument( parser.add_argument(
'--use-modern-linker', action='store_true', help='To use ModernLinker.') '--use-modern-linker', action='store_true', help='To use ModernLinker.')
parser.add_argument( parser.add_argument(
...@@ -64,9 +62,7 @@ def main(): ...@@ -64,9 +62,7 @@ def main():
options = parser.parse_args(build_utils.ExpandFileArgs(sys.argv[1:])) options = parser.parse_args(build_utils.ExpandFileArgs(sys.argv[1:]))
assert (options.enable_chromium_linker assert (options.enable_chromium_linker or not options.load_library_from_apk)
or not options.load_library_from_apk), (
'Must set --enable-chromium-linker to load library from APK.')
native_libraries_list = [] native_libraries_list = []
if options.main_component_library: if options.main_component_library:
...@@ -89,7 +85,6 @@ def main(): ...@@ -89,7 +85,6 @@ def main():
'MAYBE_FINAL': 'final ' if options.final else '', 'MAYBE_FINAL': 'final ' if options.final else '',
'USE_LINKER': bool_str(options.enable_chromium_linker), 'USE_LINKER': bool_str(options.enable_chromium_linker),
'USE_LIBRARY_IN_ZIP_FILE': bool_str(options.load_library_from_apk), 'USE_LIBRARY_IN_ZIP_FILE': bool_str(options.load_library_from_apk),
'ENABLE_LINKER_TESTS': bool_str(options.enable_chromium_linker_tests),
'USE_MODERN_LINKER': bool_str(options.use_modern_linker), 'USE_MODERN_LINKER': bool_str(options.use_modern_linker),
'LIBRARIES': ','.join(native_libraries_list), 'LIBRARIES': ','.join(native_libraries_list),
'VERSION_NUMBER': options.version_number, 'VERSION_NUMBER': options.version_number,
......
...@@ -679,7 +679,6 @@ if (enable_java_templates) { ...@@ -679,7 +679,6 @@ if (enable_java_templates) {
# enable_chromium_linker: (Optional) Whether to use the Chromium linker. # enable_chromium_linker: (Optional) Whether to use the Chromium linker.
# load_library_from_apk: (Optional) Whether libraries should be loaded from # load_library_from_apk: (Optional) Whether libraries should be loaded from
# the APK without uncompressing. # the APK without uncompressing.
# enable_chromium_linker_tests: (Optional) Whether to run tests.
# use_final_fields: True to use final fields. When false, all other # use_final_fields: True to use final fields. When false, all other
# variables must not be set. # variables must not be set.
template("write_native_libraries_java") { template("write_native_libraries_java") {
...@@ -735,10 +734,6 @@ if (enable_java_templates) { ...@@ -735,10 +734,6 @@ if (enable_java_templates) {
invoker.load_library_from_apk) { invoker.load_library_from_apk) {
args += [ "--load-library-from-apk" ] args += [ "--load-library-from-apk" ]
} }
if (defined(invoker.enable_chromium_linker_tests) &&
invoker.enable_chromium_linker_tests) {
args += [ "--enable-chromium-linker-tests" ]
}
if (defined(invoker.use_modern_linker) && invoker.use_modern_linker) { if (defined(invoker.use_modern_linker) && invoker.use_modern_linker) {
args += [ "--use-modern-linker" ] args += [ "--use-modern-linker" ]
} }
...@@ -2631,11 +2626,7 @@ if (enable_java_templates) { ...@@ -2631,11 +2626,7 @@ if (enable_java_templates) {
!_uses_static_library_synchronized_proguard !_uses_static_library_synchronized_proguard
if (_generate_native_libraries_java) { if (_generate_native_libraries_java) {
write_native_libraries_java("${_template_name}__native_libraries") { write_native_libraries_java("${_template_name}__native_libraries") {
forward_variables_from(invoker, forward_variables_from(invoker, [ "main_component_library" ])
[
"enable_chromium_linker_tests",
"main_component_library",
])
deps = [ deps = [
":${_template_name}__secondary_abi_shared_library_list", ":${_template_name}__secondary_abi_shared_library_list",
":${_template_name}__shared_library_list", ":${_template_name}__shared_library_list",
...@@ -3402,7 +3393,6 @@ if (enable_java_templates) { ...@@ -3402,7 +3393,6 @@ if (enable_java_templates) {
"disable_checkdiscard", "disable_checkdiscard",
"disable_r8_outlining", "disable_r8_outlining",
"dist_ijar_path", "dist_ijar_path",
"enable_chromium_linker_tests",
"enable_multidex", "enable_multidex",
"enable_native_mocks", "enable_native_mocks",
"generate_buildconfig_java", "generate_buildconfig_java",
...@@ -3534,7 +3524,6 @@ if (enable_java_templates) { ...@@ -3534,7 +3524,6 @@ if (enable_java_templates) {
"data", "data",
"data_deps", "data_deps",
"deps", "deps",
"enable_chromium_linker_tests",
"enable_multidex", "enable_multidex",
"failed_manifest_expectation_file", "failed_manifest_expectation_file",
"failed_proguard_expectation_file", "failed_proguard_expectation_file",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment