Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: build/common.gypi

Issue 10821066: Revert 148377 - [Android] Upstream additional changes from envsetup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « build/android/envsetup_functions.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 148738)
+++ build/common.gypi (working copy)
@@ -70,11 +70,6 @@
'android_upstream_bringup%': '<(android_upstream_bringup)',
'buildtype%': '<(buildtype)',
- # Sets whether we're building with the Android SDK/NDK (and hence with
- # Ant, value 0), or as part of the Android system (and hence with the
- # Android build system, value 1).
- 'android_build_type%': 0,
-
# Compute the architecture that we're building on.
'conditions': [
['OS=="win" or OS=="mac" or OS=="ios"', {
@@ -135,7 +130,6 @@
'enable_hidpi%': '<(enable_hidpi)',
'enable_touch_ui%': '<(enable_touch_ui)',
'android_upstream_bringup%': '<(android_upstream_bringup)',
- 'android_build_type%': '<(android_build_type)',
# We used to provide a variable for changing how libraries were built.
# This variable remains until we can clean up all the users.
@@ -605,7 +599,6 @@
'wix_path%': '<(wix_path)',
'android_upstream_bringup%': '<(android_upstream_bringup)',
'use_system_libjpeg%': '<(use_system_libjpeg)',
- 'android_build_type%': '<(android_build_type)',
# Use system yasm instead of bundled one.
'use_system_yasm%': 0,
@@ -913,9 +906,15 @@
'android_app_abi%': 'armeabi-v7a',
}],
],
+
+ # Sets whether we're building with the Android SDK/NDK (and hence
+ # with Ant, value 0), or as part of the Android system (and hence
+ # with the Android build system, value 1).
+ 'android_build_type%': 0,
},
'android_ndk_root%': '<(android_ndk_root)',
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-9/arch-<(target_arch)',
+ 'android_build_type%': '<(android_build_type)',
'android_app_abi%': '<(android_app_abi)',
},
'android_ndk_root%': '<(android_ndk_root)',
« no previous file with comments | « build/android/envsetup_functions.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698