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

Side by Side Diff: build/common.gypi

Issue 63423003: Set ENABLE_MANAGED_USERS #ifdef on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 7 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 'use_libffmpeg%': '0', 1379 'use_libffmpeg%': '0',
1380 1380
1381 # When building as part of the Android system, use system libraries 1381 # When building as part of the Android system, use system libraries
1382 # where possible to reduce ROM size. 1382 # where possible to reduce ROM size.
1383 # TODO(steveblock): Investigate using the system version of sqlite. 1383 # TODO(steveblock): Investigate using the system version of sqlite.
1384 'use_system_sqlite%': 0, # '<(android_webview_build)', 1384 'use_system_sqlite%': 0, # '<(android_webview_build)',
1385 'use_system_expat%': '<(android_webview_build)', 1385 'use_system_expat%': '<(android_webview_build)',
1386 'use_system_icu%': '<(android_webview_build)', 1386 'use_system_icu%': '<(android_webview_build)',
1387 'use_system_stlport%': '<(android_webview_build)', 1387 'use_system_stlport%': '<(android_webview_build)',
1388 1388
1389 'enable_managed_users%': 0,
1390
1391 # Copy it out one scope. 1389 # Copy it out one scope.
1392 'android_webview_build%': '<(android_webview_build)', 1390 'android_webview_build%': '<(android_webview_build)',
1393 }], # OS=="android" 1391 }], # OS=="android"
1394 ['android_webview_build==1', { 1392 ['android_webview_build==1', {
1395 # When building the WebView in the Android tree, jarjar will remap all 1393 # When building the WebView in the Android tree, jarjar will remap all
1396 # the class names, so the JNI generator needs to know this. 1394 # the class names, so the JNI generator needs to know this.
1397 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' , 1395 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' ,
1398 }], 1396 }],
1399 ['OS=="mac"', { 1397 ['OS=="mac"', {
1400 # Enable clang on mac by default! 1398 # Enable clang on mac by default!
(...skipping 3310 matching lines...) Expand 10 before | Expand all | Expand 10 after
4711 # settings in target dicts. SYMROOT is a special case, because many other 4709 # settings in target dicts. SYMROOT is a special case, because many other
4712 # Xcode variables depend on it, including variables such as 4710 # Xcode variables depend on it, including variables such as
4713 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4711 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4714 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4712 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4715 # files to appear (when present) in the UI as actual files and not red 4713 # files to appear (when present) in the UI as actual files and not red
4716 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4714 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4717 # and therefore SYMROOT, needs to be set at the project level. 4715 # and therefore SYMROOT, needs to be set at the project level.
4718 'SYMROOT': '<(DEPTH)/xcodebuild', 4716 'SYMROOT': '<(DEPTH)/xcodebuild',
4719 }, 4717 },
4720 } 4718 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698