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

Side by Side Diff: talk/libjingle_tests.gyp

Issue 1652123002: Remove Java PC support. (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
« talk/libjingle.gyp ('K') | « talk/libjingle.gyp ('k') | 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 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 257 # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
258 '-Wno-unused-function', 258 '-Wno-unused-function',
259 ], 259 ],
260 }, 260 },
261 }, 261 },
262 }], 262 }],
263 ], 263 ],
264 }, # target peerconnection_unittests 264 }, # target peerconnection_unittests
265 ], 265 ],
266 'conditions': [ 266 'conditions': [
267 ['OS=="linux"', {
268 'variables': {
269 'junit_jar': '<(DEPTH)/third_party/junit-jar/junit-4.11.jar',
kjellander_webrtc 2016/02/02 08:24:40 Please drop third_party/junit-jar as part of this
perkj_webrtc 2016/02/03 17:00:03 Done.
270 },
271 'targets': [
272 {
273 'target_name': 'libjingle_peerconnection_test_jar',
274 'type': 'none',
275 'dependencies': [
276 'libjingle.gyp:libjingle_peerconnection_jar',
277 ],
278 'actions': [
279 {
280 'variables': {
281 'java_src_dir': 'app/webrtc/javatests/src',
282 'java_files': [
283 'app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest. java',
284 'app/webrtc/javatests/src/org/webrtc/PeerConnectionTestJava.ja va',
285 ],
286 },
287 'action_name': 'create_jar',
288 'inputs': [
289 'build/build_jar.sh',
290 '<@(java_files)',
291 '<(PRODUCT_DIR)/libjingle_peerconnection.jar',
292 '<(PRODUCT_DIR)/lib/libjingle_peerconnection_so.so',
293 '<(junit_jar)',
294 ],
295 'outputs': [
296 '<(PRODUCT_DIR)/libjingle_peerconnection_test.jar',
297 ],
298 'action': [
299 'build/build_jar.sh', '<(java_home)', '<@(_outputs)',
kjellander_webrtc 2016/02/02 08:24:40 Please drop build/build_jar.sh as part of this CL
perkj_webrtc 2016/02/03 17:00:03 Done.
300 '<(INTERMEDIATE_DIR)',
301 '<(java_src_dir):<(PRODUCT_DIR)/libjingle_peerconnection.jar:<(j unit_jar)',
302 '<@(java_files)'
303 ],
304 },
305 ],
306 },
307 {
308 'target_name': 'libjingle_peerconnection_java_unittest',
309 'type': 'none',
310 'actions': [
311 {
312 'action_name': 'copy libjingle_peerconnection_java_unittest',
313 'inputs': [
314 'app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh' ,
315 '<(PRODUCT_DIR)/libjingle_peerconnection_test_jar',
316 '<(junit_jar)',
317 ],
318 'outputs': [
319 '<(PRODUCT_DIR)/libjingle_peerconnection_java_unittest',
320 ],
321 'action': [
322 'bash', '-c',
323 'rm -f <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest && '
324 'sed -e "s@GYP_JAVA_HOME@<(java_home)@" '
325 '< app/webrtc/javatests/libjingle_peerconnection_java_unittest.s h '
326 '> <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest && '
327 'cp <(junit_jar) <(PRODUCT_DIR) && '
328 'chmod u+x <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest '
329 ],
330 },
331 ],
332 },
333 ],
334 }],
335 ['OS=="android"', { 267 ['OS=="android"', {
336 'targets': [ 268 'targets': [
337 { 269 {
338 'target_name': 'libjingle_peerconnection_android_unittest', 270 'target_name': 'libjingle_peerconnection_android_unittest',
339 'type': 'none', 271 'type': 'none',
340 'dependencies': [ 272 'dependencies': [
341 'libjingle.gyp:libjingle_peerconnection_java', 273 'libjingle.gyp:libjingle_peerconnection_java',
342 ], 274 ],
343 'variables': { 275 'variables': {
344 'apk_name': 'libjingle_peerconnection_android_unittest', 276 'apk_name': 'libjingle_peerconnection_android_unittest',
345 'java_in_dir': 'app/webrtc/androidtests', 277 'java_in_dir': 'app/webrtc/androidtests',
346 'resource_dir': 'app/webrtc/androidtests/res', 278 'resource_dir': 'app/webrtc/androidtests/res',
347 'additional_src_dirs': ['app/webrtc/java/testcommon'],
348 'native_lib_target': 'libjingle_peerconnection_so', 279 'native_lib_target': 'libjingle_peerconnection_so',
349 'is_test_apk': 1, 280 'is_test_apk': 1,
350 }, 281 },
351 'includes': [ '../build/java_apk.gypi' ], 282 'includes': [ '../build/java_apk.gypi' ],
352 }, 283 },
353 ], # targets 284 ], # targets
354 }], # OS=="android" 285 }], # OS=="android"
355 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { 286 ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
356 # The >=10.7 above is required to make ARC link cleanly (e.g. as 287 # The >=10.7 above is required to make ARC link cleanly (e.g. as
357 # opposed to _compile_ cleanly, which the library under test 288 # opposed to _compile_ cleanly, which the library under test
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 'build/isolate.gypi', 393 'build/isolate.gypi',
463 ], 394 ],
464 'sources': [ 395 'sources': [
465 'peerconnection_unittests.isolate', 396 'peerconnection_unittests.isolate',
466 ], 397 ],
467 }, 398 },
468 ], 399 ],
469 }], 400 }],
470 ], 401 ],
471 } 402 }
OLDNEW
« talk/libjingle.gyp ('K') | « talk/libjingle.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698