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

Side by Side Diff: talk/libjingle.gyp

Issue 1366413003: Add C++ SurfaceTextureHandler (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed comments. Created 5 years, 2 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
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 'use_native_jni_exports': 1, 95 'use_native_jni_exports': 1,
96 }, 96 },
97 }], 97 }],
98 ['OS=="android" and build_with_chromium==0', { 98 ['OS=="android" and build_with_chromium==0', {
99 'sources': [ 99 'sources': [
100 'app/webrtc/java/jni/androidmediacodeccommon.h', 100 'app/webrtc/java/jni/androidmediacodeccommon.h',
101 'app/webrtc/java/jni/androidmediadecoder_jni.cc', 101 'app/webrtc/java/jni/androidmediadecoder_jni.cc',
102 'app/webrtc/java/jni/androidmediadecoder_jni.h', 102 'app/webrtc/java/jni/androidmediadecoder_jni.h',
103 'app/webrtc/java/jni/androidmediaencoder_jni.cc', 103 'app/webrtc/java/jni/androidmediaencoder_jni.cc',
104 'app/webrtc/java/jni/androidmediaencoder_jni.h', 104 'app/webrtc/java/jni/androidmediaencoder_jni.h',
105 'app/webrtc/java/jni/surfacetexturehelper_jni.cc',
106 'app/webrtc/java/jni/surfacetexturehelper_jni.h',
105 ] 107 ]
106 }], 108 }],
107 ], 109 ],
108 }, 110 },
109 { 111 {
110 'target_name': 'libjingle_peerconnection_jar', 112 'target_name': 'libjingle_peerconnection_jar',
111 'type': 'none', 113 'type': 'none',
112 'actions': [ 114 'actions': [
113 { 115 {
114 # TODO(jiayl): extract peerconnection_java_files and android_java_ files into a webrtc 116 # TODO(jiayl): extract peerconnection_java_files and android_java_ files into a webrtc
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 ['OS=="android" and build_with_chromium==0', { 783 ['OS=="android" and build_with_chromium==0', {
782 'sources': [ 784 'sources': [
783 'app/webrtc/androidvideocapturer.h', 785 'app/webrtc/androidvideocapturer.h',
784 'app/webrtc/androidvideocapturer.cc', 786 'app/webrtc/androidvideocapturer.cc',
785 ], 787 ],
786 }], 788 }],
787 ], 789 ],
788 }, # target libjingle_peerconnection 790 }, # target libjingle_peerconnection
789 ], 791 ],
790 } 792 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698