Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Unified Diff: build/config/android/rules.gni

Issue 640363002: Make crazy linker work in gn build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-chrome-shell-apk
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gyp ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 344202c71d156f076e821fb47842d5508fcb292c..af493bd9ff74a76276959e95a1ddc7feb13288fe 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -769,8 +769,26 @@ template("android_apk") {
_native_libs = []
if (defined(invoker.native_libs)) {
+ _use_chromium_linker = false
+ if (defined(invoker.use_chromium_linker)) {
+ _use_chromium_linker = invoker.use_chromium_linker
+ }
+
+ # TODO(GYP) add "|| profiling_full_stack_frames
+ # Only enable the chromium linker on regular builds, since the
+ # component build crashes on Android 4.4. See b/11379966
+ if (is_component_build || cpu_arch == "arm64" || cpu_arch == "x64") {
+ _use_chromium_linker = false
+ }
+
_native_libs = invoker.native_libs
_native_libs_dir = base_path + "/libs"
+
+ if (_use_chromium_linker) {
+ _native_libs += [
+ "$root_build_dir/lib.stripped/libchromium_android_linker.so"
+ ]
+ }
}
_keystore_path = android_default_keystore_path
@@ -815,12 +833,14 @@ template("android_apk") {
_srcjar_deps += [":${_template_name}__process_resources"]
if (_native_libs != []) {
- _use_chromium_linker = false
_enable_chromium_linker_tests = false
+ if (defined(invoker.enable_chromium_linker_tests)) {
+ _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests
+ }
+
_load_library_from_apk = false
_native_lib_version_name = ""
-
java_cpp_template("${_template_name}__native_libraries_java") {
package_name = "org/chromium/base/library_loader"
sources = [
@@ -836,7 +856,7 @@ template("android_apk") {
"NATIVE_LIBRARIES_VERSION_NUMBER=\"$_native_lib_version_name\"",
]
if (_use_chromium_linker) {
- defines += ["ENABLED_CHROMIUM_LINKER"]
+ defines += ["ENABLE_CHROMIUM_LINKER"]
}
if (_load_library_from_apk) {
defines += ["ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE"]
« no previous file with comments | « base/base.gyp ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698