build/java_apk.gypi - Issue 21977003: Build changes for updating Android SDK to 4.3.

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

Issue 21977003: Build changes for updating Android SDK to 4.3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Turns out we need ANDROID_SDK_VERSION in constants.py (findbugs uses it). Created 7 years, 4 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/java_apk.gypi

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

index e388690f767a9941d92b944f4d09ffba3ce71ac9..2457d3a1939c663bcb348285ab92136154707d77 100644

--- a/build/java_apk.gypi

+++ b/build/java_apk.gypi

@@ -364,7 +364,6 @@

'action': [

'python', '<(DEPTH)/build/android/gyp/apk_install.py',

- '--android-sdk-tools=<(android_sdk_tools)',

'--apk-path=<(incomplete_apk_path)',

'--build-device-configuration=<(build_device_config_path)',

'--install-record=<(apk_install_record)',

@@ -408,6 +407,7 @@

'-DANDROID_SDK_JAR=<(android_sdk_jar)',

'-DANDROID_SDK_ROOT=<(android_sdk_root)',

'-DANDROID_SDK_VERSION=<(android_sdk_version)',

+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',

'-DLIBRARY_MANIFEST_PATHS=>(library_manifest_paths)',

'-DOUT_DIR=<(intermediate_dir)',

'-DRESOURCE_DIR=<(resource_dir)',

@@ -504,6 +504,7 @@

'-DANDROID_SDK_JAR=<(android_sdk_jar)',

'-DANDROID_SDK_ROOT=<(android_sdk_root)',

'-DANDROID_SDK_VERSION=<(android_sdk_version)',

+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',

'-DAPK_NAME=<(apk_name)',

'-DCREATE_TEST_JAR_PATH=<(DEPTH)/build/android/ant/create-test-jar.js',

'-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',

@@ -576,6 +577,7 @@

'-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',

'-DANDROID_SDK_JAR=<(android_sdk_jar)',

'-DANDROID_SDK_ROOT=<(android_sdk_root)',

+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',

'-DAPK_NAME=<(apk_name)',

'-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)',

'-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)',

@@ -616,6 +618,7 @@

'python', '<(DEPTH)/build/android/gyp/ant.py',

'-quiet',

'-DANDROID_SDK_ROOT=<(android_sdk_root)',

+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',

'-DAPK_NAME=<(apk_name)',

'-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)',

'-DNATIVE_LIBS_DIR=<(apk_package_native_libs_dir)',

« no previous file with comments | « build/common.gypi ('k') | build/java_prebuilt.gypi » ('j') | no next file with comments »