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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/build/common.gypi
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 6d79aa3db9b2fbae11a35f454ebd91380947bfa0..429dd6baba7a10f782cc5b61a236c3a60815fd94 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -25,7 +25,6 @@
'include_opus%': 1,
'conditions': [
-
# Include the iLBC audio codec?
['build_with_chromium==1 or build_with_mozilla==1', {
'include_ilbc%': 0,
@@ -196,9 +195,6 @@
'include_tests%': 1,
'restrict_webrtc_logging%': 0,
}],
- ['OS=="android" or OS=="linux"', {
- '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, \'include/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a directory containing include/jni.h!\'; print dir")',
- }],
['OS=="ios"', {
'build_libjpeg%': 0,
}],
« 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