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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/bzip2/bzip2.gyp

Issue 9226012: Checkpoint: android fixes towards compilation of unit_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: miranda alphabetical issue Created 8 years, 11 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 | « content/public/browser/browser_context.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/bzip2/bzip2.gyp
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index 72730df4b231f5046d0aff9814641a55b5431190..eb603a4ff406813449ba2a3c866e2800486ece51 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -5,10 +5,10 @@
{
'variables': {
'conditions': [
- [ 'os_posix == 1 and OS != "mac"', {
+ [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
# Link to system .so since we already use it due to GTK.
'use_system_bzip2%': 1,
- }, { # os_posix != 1 or OS == "mac"
+ }, { # os_posix != 1 or OS == "mac" or OS == "android"
'use_system_bzip2%': 0,
}],
],
« no previous file with comments | « content/public/browser/browser_context.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698