Revert 4211 "Build all java files into jar for each module on An..."
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:
@ -154,18 +154,6 @@
|
||||
], # targets
|
||||
|
||||
'conditions': [
|
||||
['OS=="android"', {
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'video_render_module_java',
|
||||
'type': 'none',
|
||||
'variables': {
|
||||
'java_in_dir': 'android/java',
|
||||
},
|
||||
'includes': [ '../../../build/java.gypi' ],
|
||||
},
|
||||
],
|
||||
}],
|
||||
['include_internal_video_render==1', {
|
||||
'defines': ['WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER',],
|
||||
}],
|
||||
|
||||
Reference in New Issue
Block a user