zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 4211 "Build all java files into jar for each module on An..."

Browse Source 
Reason for revert: behold the meltdown of the "trunk" bots on http://build.chromium.org/p/chromium.webrtc.fyi/waterfall

Turns out that include in gyp is fraught with peril: https://code.google.com/p/gyp/wiki/InputFormatReference#Including_Other_Files

> Build all java files into jar for each module on Android
>
> BUG=
> R=fischman@webrtc.org, niklas.enbom@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/1636004
>
> Patch from Jeremy Mao <yujie.mao@intel.com>.

TBR=fischman@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/1660005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4222 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org
2013-06-12 17:39:29 +00:00
parent 20a993f88a
commit dd97ef4e28
11 changed files with 7 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/video_engine/test/android/android_video_demo.gypi
View File

@ -20,9 +20,15 @@
{
# TODO(leozwang): Convert building of the demo to a proper GYP target
# so this action and the custom build script is not needed.
# (http://crbug.com/255101)
'action_name': 'build_video_demo_apk',
'inputs' : [
'<(webrtc_root)/modules/audio_device/android/org/webrtc/voiceengine/WebRTCAudioDevice.java',
'<(webrtc_root)/modules/video_capture/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java',
'<(webrtc_root)/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java',
'<(webrtc_root)/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java',
'<(webrtc_root)/modules/video_render/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java',
'<(webrtc_root)/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java',
'<(webrtc_root)/modules/video_render/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java',
'<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengine/ViEMediaCodecDecoder.java',
'<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengineapp/IViEAndroidCallback.java',
'<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java',