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

Unified Diff: webrtc/api/api_java.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 | « webrtc/api/api.gyp ('k') | webrtc/api/api_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/api_java.gyp
diff --git a/webrtc/api/api_java.gyp b/webrtc/api/api_java.gyp
new file mode 100644
index 0000000000000000000000000000000000000000..e69f0e2789cb23fab81a82ca91dfb2c139d13ca4
--- /dev/null
+++ b/webrtc/api/api_java.gyp
@@ -0,0 +1,52 @@
+# Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS. All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+# This file exists only because there's no other way to avoid errors in the
+# Chromium build due to the inclusion of build/java.gypi. GYP unfortunately
+# processes all 'includes' for all .gyp files, ignoring conditions. This
+# processing takes place early in the cycle, before it's possible to use
+# variables. It will go away when WebRTC has fully migrated to GN.
+
+{
+ 'includes': [ '../build/common.gypi', ],
+ 'conditions': [
+ ['OS=="android"', {
+ 'targets': [
+ {
+ # |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': [
+ '<(webrtc_root)/api/api.gyp: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'],
+ },
+ ], # targets
+ }], # OS=="android"
+ ], # conditions
+}
« no previous file with comments | « webrtc/api/api.gyp ('k') | webrtc/api/api_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698