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

Side by Side Diff: webrtc/build/common.gypi

Issue 1685083002: Remove java_home GYP variable from webrtc/build/common.gypi (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | 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 WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 # This file contains common settings for building WebRTC components. 9 # This file contains common settings for building WebRTC components.
10 10
11 { 11 {
12 # Nesting is required in order to use variables for setting other variables. 12 # Nesting is required in order to use variables for setting other variables.
13 'variables': { 13 'variables': {
14 'variables': { 14 'variables': {
15 'variables': { 15 'variables': {
16 'variables': { 16 'variables': {
17 # This will already be set to zero by supplement.gypi 17 # This will already be set to zero by supplement.gypi
18 'build_with_chromium%': 1, 18 'build_with_chromium%': 1,
19 19
20 # Enable to use the Mozilla internal settings. 20 # Enable to use the Mozilla internal settings.
21 'build_with_mozilla%': 0, 21 'build_with_mozilla%': 0,
22 }, 22 },
23 'build_with_chromium%': '<(build_with_chromium)', 23 'build_with_chromium%': '<(build_with_chromium)',
24 'build_with_mozilla%': '<(build_with_mozilla%)', 24 'build_with_mozilla%': '<(build_with_mozilla%)',
25 'include_opus%': 1, 25 'include_opus%': 1,
26 26
27 'conditions': [ 27 'conditions': [
28
29 # Include the iLBC audio codec? 28 # Include the iLBC audio codec?
30 ['build_with_chromium==1 or build_with_mozilla==1', { 29 ['build_with_chromium==1 or build_with_mozilla==1', {
31 'include_ilbc%': 0, 30 'include_ilbc%': 0,
32 }, { 31 }, {
33 'include_ilbc%': 1, 32 'include_ilbc%': 1,
34 }], 33 }],
35 34
36 ['build_with_chromium==1', { 35 ['build_with_chromium==1', {
37 'webrtc_root%': '<(DEPTH)/third_party/webrtc', 36 'webrtc_root%': '<(DEPTH)/third_party/webrtc',
38 'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop .gyp', 37 'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop .gyp',
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 # TODO(andrew): For now, disable the Chrome plugins, which causes a 188 # TODO(andrew): For now, disable the Chrome plugins, which causes a
190 # flood of chromium-style warnings. Investigate enabling them: 189 # flood of chromium-style warnings. Investigate enabling them:
191 # http://code.google.com/p/webrtc/issues/detail?id=163 190 # http://code.google.com/p/webrtc/issues/detail?id=163
192 'clang_use_chrome_plugins%': 0, 191 'clang_use_chrome_plugins%': 0,
193 192
194 'include_pulse_audio%': 1, 193 'include_pulse_audio%': 1,
195 'include_internal_audio_device%': 1, 194 'include_internal_audio_device%': 1,
196 'include_tests%': 1, 195 'include_tests%': 1,
197 'restrict_webrtc_logging%': 0, 196 'restrict_webrtc_logging%': 0,
198 }], 197 }],
199 ['OS=="android" or OS=="linux"', {
200 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/ usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'i nclude/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a direct ory containing include/jni.h!\'; print dir")',
201 }],
202 ['OS=="ios"', { 198 ['OS=="ios"', {
203 'build_libjpeg%': 0, 199 'build_libjpeg%': 0,
204 }], 200 }],
205 ['target_arch=="arm" or target_arch=="arm64"', { 201 ['target_arch=="arm" or target_arch=="arm64"', {
206 'prefer_fixed_point%': 1, 202 'prefer_fixed_point%': 1,
207 }], 203 }],
208 ['(target_arch=="arm" and (arm_neon==1 or arm_neon_optional==1)) or target _arch=="arm64"', { 204 ['(target_arch=="arm" and (arm_neon==1 or arm_neon_optional==1)) or target _arch=="arm64"', {
209 'build_with_neon%': 1, 205 'build_with_neon%': 1,
210 }], 206 }],
211 ['OS!="ios" and (target_arch!="arm" or arm_version>=7) and target_arch!="m ips64el"', { 207 ['OS!="ios" and (target_arch!="arm" or arm_version>=7) and target_arch!="m ips64el"', {
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 # of a more specific macro. 488 # of a more specific macro.
493 'defines': [ 489 'defines': [
494 'WEBRTC_POSIX', 490 'WEBRTC_POSIX',
495 ], 491 ],
496 }], 492 }],
497 ], 493 ],
498 }, 494 },
499 }, # target_defaults 495 }, # target_defaults
500 } 496 }
501 497
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698