build/config/android/internal_rules.gni - Issue 681713002: Update from chromium https://crrev.com/301315

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/internal_rules.gni

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master

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:

Index: build/config/android/internal_rules.gni

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

index d9522ce4a5ddb400b935135d8a9251a28e8e8cb0..de29cce90a3bdb1bfd1e732c21da9aa356f7bbe9 100644

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

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

@@ -253,8 +253,8 @@ template("create_apk") {

_asset_location = invoker.asset_location

}

- _version_code = "1"

- _version_name = "Developer Build"

+ _version_code = invoker.version_code

+ _version_name = invoker.version_name

_base_apk_path = _base_path + ".apk_intermediates"

@@ -557,7 +557,7 @@ template("android_java_library") {

if (defined(invoker.testonly)) { testonly = invoker.testonly }

assert(defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir)

- || defined(invoker.srcjars))

+ || defined(invoker.srcjars) || defined(invoker.srcjar_deps))

assert(defined(invoker.build_config))

assert(defined(invoker.jar_path))

assert(defined(invoker.dex_path))

« no previous file with comments | « build/config/android/config.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »