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

Unified Diff: webrtc/api/api.gyp

Issue 2080563002: Workaround java.gypi inclusion error in Chromium builds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Changes to all.gyp Created 4 years, 6 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 | « all.gyp ('k') | webrtc/api/api_java.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/api.gyp
diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
index f63e7e4b11a4a28e967eae0d78bafb3a0a657533..8525eb09c72f64c8db07b5f06b67b0ec6d59e8e4 100644
--- a/webrtc/api/api.gyp
+++ b/webrtc/api/api.gyp
@@ -89,35 +89,6 @@
'use_native_jni_exports': 1,
},
},
- {
- # |libjingle_peerconnection_java| builds a jar file with name
- # libjingle_peerconnection_java.jar using Chrome's build system.
- # It includes all Java files needed to setup a PeeerConnection call
- # from Android.
- 'target_name': 'libjingle_peerconnection_java',
- 'type': 'none',
- 'dependencies': [
- 'libjingle_peerconnection_so',
- ],
- 'variables': {
- # Designate as Chromium code and point to our lint settings to
- # enable linting of the WebRTC code (this is the only way to make
- # lint_action invoke the Android linter).
- 'android_manifest_path': '<(webrtc_root)/build/android/AndroidManifest.xml',
- 'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml',
- 'chromium_code': 1,
- 'java_in_dir': 'java',
- 'webrtc_base_dir': '<(webrtc_root)/base',
- 'webrtc_modules_dir': '<(webrtc_root)/modules',
- 'additional_src_dirs' : [
- 'java/android',
- '<(webrtc_base_dir)/java/src',
- '<(webrtc_modules_dir)/audio_device/android/java/src',
-
- ],
- },
- 'includes': ['../../build/java.gypi'],
- }, # libjingle_peerconnection_java
]
}],
], # conditions
« no previous file with comments | « all.gyp ('k') | webrtc/api/api_java.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698