build/common.gypi - Issue 1162943008: Make aapt and aidl paths flexible.

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/common.gypi

Issue 1162943008: Make aapt and aidl paths flexible. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix GN builds 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:

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index c8b909240d1520ded30a10e8485f5e0dc84f5471..e6babbd8f34bc153e07b2bc6c695cd51f523cba5 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -1692,7 +1692,7 @@

'host_os%': '<(host_os)',

'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)',

- # Android SDK build tools (e.g. dx, aapt, aidl)

+ # Android SDK build tools (e.g. dx, aidl)

'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_build_tools_version)',

# Android API level 16 is JB (Android 4.1) which is the minimum

@@ -1761,6 +1761,7 @@

'android_ndk_include': '<(android_ndk_sysroot)/usr/include',

'android_ndk_lib': '<(android_ndk_sysroot)/<(android_ndk_lib_dir)',

'android_sdk_tools%': '<(android_sdk_tools)',

+ 'android_aapt_path%': '<(android_sdk_tools)/aapt',

'android_sdk%': '<(android_sdk)',

'android_sdk_jar%': '<(android_sdk)/android.jar',

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