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

Unified 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, 11 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
« talk/libjingle.gyp ('K') | « talk/libjingle.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/libjingle_tests.gyp
diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp
index cbf25aa0bbc55dca30d23242eb1ac65a21b50c15..e496d074aa3b352a2dd6e765dbdf34601e235649 100755
--- a/talk/libjingle_tests.gyp
+++ b/talk/libjingle_tests.gyp
@@ -264,74 +264,6 @@
}, # target peerconnection_unittests
],
'conditions': [
- ['OS=="linux"', {
- 'variables': {
- '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.
- },
- 'targets': [
- {
- 'target_name': 'libjingle_peerconnection_test_jar',
- 'type': 'none',
- 'dependencies': [
- 'libjingle.gyp:libjingle_peerconnection_jar',
- ],
- 'actions': [
- {
- 'variables': {
- 'java_src_dir': 'app/webrtc/javatests/src',
- 'java_files': [
- 'app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java',
- 'app/webrtc/javatests/src/org/webrtc/PeerConnectionTestJava.java',
- ],
- },
- 'action_name': 'create_jar',
- 'inputs': [
- 'build/build_jar.sh',
- '<@(java_files)',
- '<(PRODUCT_DIR)/libjingle_peerconnection.jar',
- '<(PRODUCT_DIR)/lib/libjingle_peerconnection_so.so',
- '<(junit_jar)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/libjingle_peerconnection_test.jar',
- ],
- 'action': [
- '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.
- '<(INTERMEDIATE_DIR)',
- '<(java_src_dir):<(PRODUCT_DIR)/libjingle_peerconnection.jar:<(junit_jar)',
- '<@(java_files)'
- ],
- },
- ],
- },
- {
- 'target_name': 'libjingle_peerconnection_java_unittest',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'copy libjingle_peerconnection_java_unittest',
- 'inputs': [
- 'app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh',
- '<(PRODUCT_DIR)/libjingle_peerconnection_test_jar',
- '<(junit_jar)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/libjingle_peerconnection_java_unittest',
- ],
- 'action': [
- 'bash', '-c',
- 'rm -f <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest && '
- 'sed -e "s@GYP_JAVA_HOME@<(java_home)@" '
- '< app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh '
- '> <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest && '
- 'cp <(junit_jar) <(PRODUCT_DIR) && '
- 'chmod u+x <(PRODUCT_DIR)/libjingle_peerconnection_java_unittest'
- ],
- },
- ],
- },
- ],
- }],
['OS=="android"', {
'targets': [
{
@@ -344,7 +276,6 @@
'apk_name': 'libjingle_peerconnection_android_unittest',
'java_in_dir': 'app/webrtc/androidtests',
'resource_dir': 'app/webrtc/androidtests/res',
- 'additional_src_dirs': ['app/webrtc/java/testcommon'],
'native_lib_target': 'libjingle_peerconnection_so',
'is_test_apk': 1,
},
« 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