build/config/android/config.gni - Issue 787803004: Update from https://crrev.com/307664

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

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

Patch Set: Rebase. Created 6 years 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/config.gni

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

index 82405dd020db7cad88b9c409997e707ed69dac3b..60934c2e0b54a5300681e87663e1b16b43d00ca6 100644

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

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

@@ -12,7 +12,9 @@ if (is_android) {

if (has_chrome_android_internal) {

import("//clank/config.gni")

- } else {

+ }

+ if (!defined(default_android_sdk_root)) {

default_android_sdk_root = "//third_party/android_tools/sdk"

default_android_sdk_version = "21"

default_android_sdk_build_tools_version = "21.0.1"

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