Skip to content

GitLab

T
tangled
Commit 43c48e4e authored by agrieve's avatar agrieve Committed by Commit bot
Browse files
Options

Revert of Make secondary abi work for component build (patchset #5 id:80001 of... 

Revert of Make secondary abi work for component build (patchset #5 id:80001 of https://codereview.chromium.org/2319273002/ )

Reason for revert:
Broke v8 roller

Original issue's description:
> Make secondary abi work for component build
>
> Add secondary_abi_shared_libraries to pack all the secondary abi
> shared libraries into APK.
>
> BUG=622855
>
> Committed: https://crrev.com/3ac692c2e67e8030a30e4ebcd12240352944f898
> Cr-Commit-Position: refs/heads/master@{#417441}

TBR=machenbach@chromium.org,michaelbai@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=622855

Review-Url: https://codereview.chromium.org/2327063002
Cr-Commit-Position: refs/heads/master@{#417580}
parent 67900875
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 168 deletions
build/android/BUILD.gn
View file @ 43c48e4e
...@@ -70,7 +70,7 @@ copy("cpplib_unstripped") { ...@@ -70,7 +70,7 @@ copy("cpplib_unstripped") {
action("cpplib_stripped") { action("cpplib_stripped") {
_strip_bin = "${android_tool_prefix}strip" _strip_bin = "${android_tool_prefix}strip"
_soname = "libc++_shared.so" _soname = "libc++_shared.so"
_input_so = "${root_shlib_dir}/lib.unstripped/${_soname}" _input_so = "${root_out_dir}/lib.unstripped/${_soname}"
_output_so = "${root_shlib_dir}/${_soname}" _output_so = "${root_shlib_dir}/${_soname}"
deps = [ deps = [
...@@ -91,9 +91,9 @@ action("cpplib_stripped") { ...@@ -91,9 +91,9 @@ action("cpplib_stripped") {
_output_so, _output_so,
] ]
_rebased_strip_bin = rebase_path(_strip_bin, root_build_dir) _rebased_strip_bin = rebase_path(_strip_bin, root_out_dir)
_rebased_input_so = rebase_path(_input_so, root_build_dir) _rebased_input_so = rebase_path(_input_so, root_out_dir)
_rebased_output_so = rebase_path(_output_so, root_build_dir) _rebased_output_so = rebase_path(_output_so, root_out_dir)
args = [ args = [
_rebased_strip_bin, _rebased_strip_bin,
"--strip-unneeded", "--strip-unneeded",
......
build/android/gyp/write_build_config.py
View file @ 43c48e4e
...@@ -209,11 +209,6 @@ def _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files): ...@@ -209,11 +209,6 @@ def _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files):
ret.reverse() ret.reverse()
return ret return ret
def _CreateJavaLibrariesList(library_paths):
""" Create a java literal array with the "base" library names:
e.g. libfoo.so -> foo
"""
return ('{%s}' % ','.join(['"%s"' % s[3:-3] for s in library_paths]))
def main(argv): def main(argv):
parser = optparse.OptionParser() parser = optparse.OptionParser()
...@@ -269,9 +264,6 @@ def main(argv): ...@@ -269,9 +264,6 @@ def main(argv):
parser.add_option('--shared-libraries-runtime-deps', parser.add_option('--shared-libraries-runtime-deps',
help='Path to file containing runtime deps for shared ' help='Path to file containing runtime deps for shared '
'libraries.') 'libraries.')
parser.add_option('--secondary-abi-shared-libraries-runtime-deps',
help='Path to file containing runtime deps for secondary '
'abi shared libraries.')
# apk options # apk options
parser.add_option('--apk-path', help='Path to the target\'s apk output.') parser.add_option('--apk-path', help='Path to the target\'s apk output.')
...@@ -637,24 +629,15 @@ def main(argv): ...@@ -637,24 +629,15 @@ def main(argv):
options.shared_libraries_runtime_deps or '[]') options.shared_libraries_runtime_deps or '[]')
if runtime_deps_files: if runtime_deps_files:
library_paths = _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files) library_paths = _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files)
java_libraries_list = _CreateJavaLibrariesList(library_paths) # Create a java literal array with the "base" library names:
# e.g. libfoo.so -> foo
secondary_abi_library_paths = [] java_libraries_list = ('{%s}' % ','.join(
secondary_abi_java_libraries_list = None ['"%s"' % s[3:-3] for s in library_paths]))
secondary_abi_runtime_deps_files = build_utils.ParseGnList(
options.secondary_abi_shared_libraries_runtime_deps or '[]')
if secondary_abi_runtime_deps_files:
secondary_abi_library_paths = _ExtractSharedLibsFromRuntimeDeps(
secondary_abi_runtime_deps_files)
secondary_abi_java_libraries_list = _CreateJavaLibrariesList(
secondary_abi_library_paths)
all_inputs.extend(runtime_deps_files) all_inputs.extend(runtime_deps_files)
config['native'] = { config['native'] = {
'libraries': library_paths, 'libraries': library_paths,
'secondary_abi_libraries': secondary_abi_library_paths,
'java_libraries_list': java_libraries_list, 'java_libraries_list': java_libraries_list,
'secondary_abi_java_libraries_list': secondary_abi_java_libraries_list,
} }
config['assets'], config['uncompressed_assets'] = ( config['assets'], config['uncompressed_assets'] = (
_MergeAssets(deps.All('android_assets'))) _MergeAssets(deps.All('android_assets')))
......
build/config/android/internal_rules.gni
View file @ 43c48e4e
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
import("//build_overrides/build.gni") import("//build_overrides/build.gni")
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
import("//build/config/sanitizers/sanitizers.gni") import("//build/config/sanitizers/sanitizers.gni")
import("//third_party/android_platform/config.gni")
assert(is_android) assert(is_android)
...@@ -301,17 +300,6 @@ template("write_build_config") { ...@@ -301,17 +300,6 @@ template("write_build_config") {
] ]
} }
if (defined(invoker.secondary_abi_shared_libraries_runtime_deps_file)) {
# Don't list secondary_abi_shared_libraries_runtime_deps_file as an
# input in order to avoid having to depend on the runtime_deps target.
# See comment in rules.gni for why we do this.
args += [
"--secondary-abi-shared-libraries-runtime-deps",
rebase_path(invoker.secondary_abi_shared_libraries_runtime_deps_file,
root_build_dir),
]
}
if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) { if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
args += [ args += [
"--proguard-enabled", "--proguard-enabled",
...@@ -1284,16 +1272,8 @@ if (enable_java_templates) { ...@@ -1284,16 +1272,8 @@ if (enable_java_templates) {
if (_native_lib_placeholders != []) { if (_native_lib_placeholders != []) {
args += [ "--native-lib-placeholders=$_native_lib_placeholders" ] args += [ "--native-lib-placeholders=$_native_lib_placeholders" ]
} }
if (defined(invoker.secondary_native_libs) &&
# TODO (michaelbai): Remove the secondary_native_libs variable. invoker.secondary_native_libs != []) {
if (defined(invoker.secondary_abi_native_libs_filearg)) {
assert(defined(android_app_secondary_abi))
args += [
"--secondary-native-libs=${invoker.secondary_abi_native_libs_filearg}",
"--secondary-android-abi=$android_app_secondary_abi",
]
} else if (defined(invoker.secondary_native_libs) &&
invoker.secondary_native_libs != []) {
assert(defined(android_app_secondary_abi)) assert(defined(android_app_secondary_abi))
inputs += invoker.secondary_native_libs inputs += invoker.secondary_native_libs
_secondary_native_libs = rebase_path(invoker.secondary_native_libs) _secondary_native_libs = rebase_path(invoker.secondary_native_libs)
...@@ -1618,7 +1598,6 @@ if (enable_java_templates) { ...@@ -1618,7 +1598,6 @@ if (enable_java_templates) {
"emma_instrument", "emma_instrument",
"native_lib_placeholders", "native_lib_placeholders",
"native_libs_filearg", "native_libs_filearg",
"secondary_abi_native_libs_filearg",
"secondary_native_libs", "secondary_native_libs",
"uncompress_shared_libraries", "uncompress_shared_libraries",
"write_asset_list", "write_asset_list",
...@@ -2662,39 +2641,3 @@ if (enable_java_templates) { ...@@ -2662,39 +2641,3 @@ if (enable_java_templates) {
} }
} }
} }
template("pack_relocation_section") {
assert(defined(invoker.file_list_json))
assert(defined(invoker.libraries_filearg))
action(target_name) {
forward_variables_from(invoker,
[
"deps",
"public_deps",
"inputs",
"testonly",
])
script = "//build/android/gyp/pack_relocations.py"
depfile = "$target_gen_dir/$target_name.d"
_packed_libraries_dir = "$target_gen_dir/$target_name/packed-libs"
outputs = [
invoker.file_list_json,
]
deps += [ relocation_packer_target ]
args = [
"--depfile",
rebase_path(depfile, root_build_dir),
"--enable-packing=1",
"--android-pack-relocations",
rebase_path(relocation_packer_exe, root_build_dir),
"--stripped-libraries-dir",
rebase_path(root_build_dir, root_build_dir),
"--packed-libraries-dir",
rebase_path(_packed_libraries_dir, root_build_dir),
"--libraries=${invoker.libraries_filearg}",
"--filelistjson",
rebase_path(invoker.file_list_json, root_build_dir),
]
}
}
build/config/android/rules.gni
View file @ 43c48e4e
...@@ -1424,9 +1424,6 @@ if (enable_java_templates) { ...@@ -1424,9 +1424,6 @@ if (enable_java_templates) {
# shared_libraries: List shared_library targets to bundle. If these # shared_libraries: List shared_library targets to bundle. If these
# libraries depend on other shared_library targets, those dependencies will # libraries depend on other shared_library targets, those dependencies will
# also be included in the apk (e.g. for is_component_build). # also be included in the apk (e.g. for is_component_build).
# secondary_abi_shared_libraries: secondary abi shared_library targets to
# bundle. If these libraries depend on other shared_library targets, those
# dependencies will also be included in the apk (e.g. for is_component_build).
# native_lib_placeholders: List of placeholder filenames to add to the apk # native_lib_placeholders: List of placeholder filenames to add to the apk
# (optional). # (optional).
# apk_under_test: For an instrumentation test apk, this is the target of the # apk_under_test: For an instrumentation test apk, this is the target of the
...@@ -1441,8 +1438,7 @@ if (enable_java_templates) { ...@@ -1441,8 +1438,7 @@ if (enable_java_templates) {
# requires_sdk_api_level_23: If defined and true, the apk is intended for # requires_sdk_api_level_23: If defined and true, the apk is intended for
# installation only on Android M or later. In these releases the system # installation only on Android M or later. In these releases the system
# linker does relocation unpacking, so we can enable it unconditionally. # linker does relocation unpacking, so we can enable it unconditionally.
# secondary_native_libs (deprecated): The path of native libraries for secondary # secondary_native_libs: The path of native libraries for secondary app abi.
# app abi.
# run_findbugs_override: Forces run_findbugs on or off. If undefined, the # run_findbugs_override: Forces run_findbugs on or off. If undefined, the
# default will use the build arg run_findbugs. # default will use the build arg run_findbugs.
# proguard_jar_path: The path to proguard.jar you wish to use. If undefined, # proguard_jar_path: The path to proguard.jar you wish to use. If undefined,
...@@ -1558,26 +1554,14 @@ if (enable_java_templates) { ...@@ -1558,26 +1554,14 @@ if (enable_java_templates) {
# The dependency that makes the chromium linker, if any is needed. # The dependency that makes the chromium linker, if any is needed.
_native_libs_deps = [] _native_libs_deps = []
_shared_libraries_is_valid =
defined(invoker.shared_libraries) && invoker.shared_libraries != []
_secondary_abi_native_libs_deps = []
assert(_secondary_abi_native_libs_deps == []) # mark as used.
_secondary_abi_shared_libraries_is_valid =
defined(invoker.secondary_abi_shared_libraries) &&
invoker.secondary_abi_shared_libraries != []
if (is_component_build || is_asan) {
if (_shared_libraries_is_valid) {
_native_libs_deps += [ "//build/android:cpplib_stripped" ]
}
if (_secondary_abi_shared_libraries_is_valid) {
_secondary_abi_native_libs_deps += [ "//build/android:cpplib_stripped($android_secondary_abi_toolchain)" ]
}
}
if (_shared_libraries_is_valid) { if (defined(invoker.shared_libraries) && invoker.shared_libraries != []) {
_native_libs_deps += invoker.shared_libraries _native_libs_deps += invoker.shared_libraries
if (is_component_build || is_asan) {
_native_libs_deps += [ "//build/android:cpplib_stripped" ]
}
# To determine the filenames of all dependent shared libraries, write the # To determine the filenames of all dependent shared libraries, write the
# runtime deps of |shared_libraries| to a file during "gn gen". # runtime deps of |shared_libraries| to a file during "gn gen".
# write_build_config.py will then grep this file for *.so to obtain the # write_build_config.py will then grep this file for *.so to obtain the
...@@ -1599,21 +1583,6 @@ if (enable_java_templates) { ...@@ -1599,21 +1583,6 @@ if (enable_java_templates) {
} }
} }
if (_secondary_abi_shared_libraries_is_valid) {
_secondary_abi_native_libs_deps += invoker.secondary_abi_shared_libraries
# To determine the filenames of all dependent shared libraries, write the
# runtime deps of |shared_libraries| to a file during "gn gen".
# write_build_config.py will then grep this file for *.so to obtain the
# complete list.
_secondary_abi_runtime_deps_file =
"$target_gen_dir/${_template_name}.secondary.abi.native.runtimedeps"
group("${_template_name}_secondary_abi__runtime_deps") {
deps = _secondary_abi_native_libs_deps
write_runtime_deps = _secondary_abi_runtime_deps_file
}
}
if (defined(invoker.deps)) { if (defined(invoker.deps)) {
set_sources_assignment_filter([ "*manifest*" ]) set_sources_assignment_filter([ "*manifest*" ])
sources = invoker.deps sources = invoker.deps
...@@ -1692,10 +1661,6 @@ if (enable_java_templates) { ...@@ -1692,10 +1661,6 @@ if (enable_java_templates) {
if (_native_libs_deps != []) { if (_native_libs_deps != []) {
shared_libraries_runtime_deps_file = _runtime_deps_file shared_libraries_runtime_deps_file = _runtime_deps_file
} }
if (_secondary_abi_native_libs_deps != []) {
secondary_abi_shared_libraries_runtime_deps_file =
_secondary_abi_runtime_deps_file
}
} }
_final_deps = [] _final_deps = []
...@@ -1963,62 +1928,51 @@ if (enable_java_templates) { ...@@ -1963,62 +1928,51 @@ if (enable_java_templates) {
_native_libs_file_arg_dep = ":$build_config_target" _native_libs_file_arg_dep = ":$build_config_target"
_native_libs_file_arg = "@FileArg($_rebased_build_config:native:libraries)" _native_libs_file_arg = "@FileArg($_rebased_build_config:native:libraries)"
_secondary_abi_native_libs_file_arg_dep = ":$build_config_target"
_secondary_abi_native_libs_file_arg =
"@FileArg($_rebased_build_config:native:secondary_abi_libraries)"
assert(_secondary_abi_native_libs_file_arg != "" &&
_secondary_abi_native_libs_file_arg_dep != "") # Mark as used.
if (_native_libs_deps != [] && _enable_relocation_packing) { if (_native_libs_deps != [] && _enable_relocation_packing) {
_prepare_native_target_name = "${_template_name}__prepare_native" _prepare_native_target_name = "${_template_name}__prepare_native"
_native_libs_dir = "$gen_dir/packed-libs"
_native_libs_json = "$gen_dir/packed-libs/filelist.json" _native_libs_json = "$gen_dir/packed-libs/filelist.json"
_rebased_native_libs_json = rebase_path(_native_libs_json, root_build_dir) _rebased_native_libs_json = rebase_path(_native_libs_json, root_build_dir)
_native_libs_file_arg_dep = ":$_prepare_native_target_name" _native_libs_file_arg_dep = ":$_prepare_native_target_name"
_native_libs_file_arg = "@FileArg($_rebased_native_libs_json:files)" _native_libs_file_arg = "@FileArg($_rebased_native_libs_json:files)"
pack_relocation_section(_prepare_native_target_name) { action(_prepare_native_target_name) {
forward_variables_from(invoker, forward_variables_from(invoker,
[ [
"deps", "deps",
"public_deps", "public_deps",
]) ])
file_list_json = _native_libs_json script = "//build/android/gyp/pack_relocations.py"
libraries_filearg = depfile = "$target_gen_dir/$target_name.d"
"@FileArg(${_rebased_build_config}:native:libraries)" outputs = [
_native_libs_json,
]
inputs = [ inputs = [
_build_config, _build_config,
] ]
deps += _native_libs_deps deps += _native_libs_deps
deps += [ ":$build_config_target" ] deps += [
} ":$build_config_target",
if (_secondary_abi_native_libs_deps != []) { relocation_packer_target,
_prepare_native_target_name = ]
"${_template_name}_secondary_abi__prepare_native"
_native_libs_json =
"$gen_dir/packed-libs/$android_secondary_abi_cpu/filelist.json"
_rebased_native_libs_json =
rebase_path(_native_libs_json, root_build_dir)
_secondary_abi_native_libs_file_arg_dep =
":$_prepare_native_target_name"
_secondary_abi_native_libs_file_arg =
"@FileArg($_rebased_native_libs_json:files)"
pack_relocation_section(_prepare_native_target_name) {
forward_variables_from(invoker,
[
"deps",
"public_deps",
])
file_list_json = _native_libs_json
libraries_filearg = "@FileArg(${_rebased_build_config}:native:secondary_abi_libraries)"
inputs = [
_build_config,
]
deps += _secondary_abi_native_libs_deps args = [
deps += [ ":$build_config_target" ] "--depfile",
} rebase_path(depfile, root_build_dir),
"--enable-packing=1",
"--android-pack-relocations",
rebase_path(relocation_packer_exe, root_build_dir),
"--stripped-libraries-dir",
rebase_path(root_build_dir, root_build_dir),
"--packed-libraries-dir",
rebase_path(_native_libs_dir, root_build_dir),
"--libraries=@FileArg(${_rebased_build_config}:native:libraries)",
"--filelistjson=$_rebased_native_libs_json",
]
} }
} }
...@@ -2113,12 +2067,6 @@ if (enable_java_templates) { ...@@ -2113,12 +2067,6 @@ if (enable_java_templates) {
_extra_native_libs_even_when_incremental _extra_native_libs_even_when_incremental
} }
if (_secondary_abi_native_libs_deps != [] && !_create_abi_split) {
deps += _secondary_abi_native_libs_deps +
[ _secondary_abi_native_libs_file_arg_dep ]
secondary_abi_native_libs_filearg = _secondary_abi_native_libs_file_arg
}
# Placeholders necessary for some older devices. # Placeholders necessary for some older devices.
# http://crbug.com/395038 # http://crbug.com/395038
forward_variables_from(invoker, [ "native_lib_placeholders" ]) forward_variables_from(invoker, [ "native_lib_placeholders" ])
......
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