build/config/android/rules.gni - Issue 1072533002: crazy linker: convert relocation unpacking to Android style.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1072533002: crazy linker: convert relocation unpacking to Android style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updates to gn to match gyp. Created 5 years, 6 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

Index: build/config/android/rules.gni

diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni

index 99dbccef9ce117c6c245e17233db2de8a82f3578..0c135b362893b073904b951598c7b7f644386c08 100644

--- a/build/config/android/rules.gni

+++ b/build/config/android/rules.gni

@@ -5,8 +5,8 @@

import("//base/android/linker/config.gni")

import("//build/config/android/config.gni")

import("//build/config/android/internal_rules.gni")

+import("//third_party/android_platform/config.gni")

import("//tools/grit/grit_rule.gni")

-import("//tools/relocation_packer/config.gni")

assert(is_android)

@@ -1572,12 +1572,9 @@ template("android_apk") {

"--depfile",

rebase_path(depfile, root_build_dir),

"--enable-packing=$enable_packing_arg",

- "--has-relocations-with-addends=$relocations_have_addends",

"--exclude-packing-list=$skip_packing_list",

"--android-pack-relocations",

rebase_path(relocation_packer_exe, root_build_dir),

- "--android-objcopy",

- rebase_path(android_objcopy, root_build_dir),

"--stripped-libraries-dir",

rebase_path(root_build_dir, root_build_dir),

"--packed-libraries-dir",

« no previous file with comments | « build/android/pack_arm_relocations.gypi ('k') | third_party/android_crazy_linker/README.chromium » ('j') | no next file with comments »