From 000dde99c8794613e80d3b6c7252aed42d16e8c2 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Fri, 20 Dec 2013 22:49:35 +0000 Subject: [PATCH] Android build: make it quiet on success and not overly noisy on failure. - OpenSLDemo and WebRTCDemo get the sauce that AppRTCDemo got in r5271 - libjingle_peerconnection_jar is now silent on success - Fix a bug introduced by r5271 which caused ant logs to be emitted to a subdir of talk/examples instead of in the gyp output directory. R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/6199005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5332 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/libjingle.gyp | 12 +++++--- talk/libjingle_examples.gyp | 4 +-- webrtc/modules/audio_device/audio_device.gypi | 24 +++++++++------- webrtc/webrtc_examples.gyp | 28 +++++++++++-------- 4 files changed, 40 insertions(+), 28 deletions(-) diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index dced3d924b..7e4767b7fe 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -80,6 +80,7 @@ 'variables': { 'java_src_dir': 'app/webrtc/java/src', 'webrtc_modules_dir': '<(webrtc_root)/modules', + 'build_jar_log': '<(INTERMEDIATE_DIR)/build_jar.log', 'peerconnection_java_files': [ 'app/webrtc/java/src/org/webrtc/AudioSource.java', 'app/webrtc/java/src/org/webrtc/AudioTrack.java', @@ -137,10 +138,13 @@ }], ], 'action': [ - 'build/build_jar.sh', '<(java_home)', '<@(_outputs)', - '<(INTERMEDIATE_DIR)', - '<(build_classpath)', - '<@(java_files)' + 'bash', '-ec', + 'mkdir -p <(INTERMEDIATE_DIR) && ' + '{ build/build_jar.sh <(java_home) <@(_outputs) ' + ' <(INTERMEDIATE_DIR)/build_jar.tmp ' + ' <(build_classpath) <@(java_files) ' + ' > <(build_jar_log) 2>&1 || ' + ' { cat <(build_jar_log) ; exit 1; } }' ], }, ], diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp index 1e2eeb0fb7..a3f5b12c47 100755 --- a/talk/libjingle_examples.gyp +++ b/talk/libjingle_examples.gyp @@ -305,16 +305,16 @@ '<(PRODUCT_DIR)/AppRTCDemo-debug.apk', ], 'variables': { - 'ant_log': '<(INTERMEDIATE_DIR)/ant.log', + 'ant_log': '../../<(INTERMEDIATE_DIR)/ant.log', # ../.. to compensate for the cd examples/android below. }, 'action': [ 'bash', '-ec', 'rm -fr <(_outputs) examples/android/{bin,libs} && ' + 'mkdir -p <(INTERMEDIATE_DIR) && ' # Must happen _before_ the cd below 'mkdir -p examples/android/libs/<(android_app_abi) && ' 'cp <(PRODUCT_DIR)/libjingle_peerconnection.jar examples/android/libs/ &&' '<(android_strip) -o examples/android/libs/<(android_app_abi)/libjingle_peerconnection_so.so <(PRODUCT_DIR)/libjingle_peerconnection_so.so &&' 'cd examples/android && ' - 'mkdir -p <(INTERMEDIATE_DIR) && ' '{ ant -q -l <(ant_log) debug || ' ' { cat <(ant_log) ; exit 1; } } && ' 'cd - > /dev/null && ' diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi index 1e14747f3d..de008e885a 100644 --- a/webrtc/modules/audio_device/audio_device.gypi +++ b/webrtc/modules/audio_device/audio_device.gypi @@ -280,6 +280,7 @@ 'action_name': 'build_opensldemo_apk', 'variables': { 'android_opensl_demo_root': '<(webrtc_root)/modules/audio_device/android/test', + 'ant_log': '../../../<(INTERMEDIATE_DIR)/ant.log', # ../../.. to compensate for the cd below. }, 'inputs' : [ '<(PRODUCT_DIR)/lib.java/audio_device_module_java.jar', @@ -292,16 +293,19 @@ '<(android_opensl_demo_root)/project.properties', ], 'outputs': ['<(PRODUCT_DIR)/OpenSlDemo-debug.apk'], - 'action': ['bash', '-ec', - 'rm -f <(_outputs) && ' - 'mkdir -p <(android_opensl_demo_root)/libs/<(android_app_abi) && ' - '<(android_strip) -o <(android_opensl_demo_root)/libs/<(android_app_abi)/libopensl-demo-jni.so <(PRODUCT_DIR)/libopensl-demo-jni.so && ' - 'cp <(PRODUCT_DIR)/lib.java/audio_device_module_java.jar <(android_opensl_demo_root)/libs/ &&' - 'cd <(android_opensl_demo_root) && ' - 'ant debug && ' - 'cd - && ' - 'cp <(android_opensl_demo_root)/bin/OpenSlDemo-debug.apk <(_outputs)' - ], + 'action': [ + 'bash', '-ec', + 'rm -f <(_outputs) && ' + 'mkdir -p <(android_opensl_demo_root)/libs/<(android_app_abi) && ' + 'mkdir -p <(INTERMEDIATE_DIR) && ' # Must happen _before_ the cd below + '<(android_strip) -o <(android_opensl_demo_root)/libs/<(android_app_abi)/libopensl-demo-jni.so <(PRODUCT_DIR)/libopensl-demo-jni.so && ' + 'cp <(PRODUCT_DIR)/lib.java/audio_device_module_java.jar <(android_opensl_demo_root)/libs/ &&' + 'cd <(android_opensl_demo_root) && ' + '{ ant -q -l <(ant_log) debug || ' + ' { cat <(ant_log) ; exit 1; } } && ' + 'cd - > /dev/null && ' + 'cp <(android_opensl_demo_root)/bin/OpenSlDemo-debug.apk <(_outputs)' + ], }, ], }], diff --git a/webrtc/webrtc_examples.gyp b/webrtc/webrtc_examples.gyp index 84ac3ba346..328681af6b 100644 --- a/webrtc/webrtc_examples.gyp +++ b/webrtc/webrtc_examples.gyp @@ -51,6 +51,7 @@ 'action_name': 'build_webrtcdemo_apk', 'variables': { 'android_webrtc_demo_root': '<(webrtc_root)/examples/android/media_demo', + 'ant_log': '../../../<(INTERMEDIATE_DIR)/ant.log', # ../../.. to compensate for the cd below. }, 'inputs' : [ '<(PRODUCT_DIR)/lib.java/audio_device_module_java.jar', @@ -64,18 +65,21 @@ '<(android_webrtc_demo_root)/project.properties', ], 'outputs': ['<(PRODUCT_DIR)/WebRTCDemo-debug.apk'], - 'action': ['bash', '-ec', - 'rm -fr <(_outputs) <(android_webrtc_demo_root)/{bin,libs} && ' - 'mkdir -p <(android_webrtc_demo_root)/libs/<(android_app_abi) && ' - 'cp <(PRODUCT_DIR)/lib.java/audio_device_module_java.jar <(android_webrtc_demo_root)/libs/ &&' - 'cp <(PRODUCT_DIR)/lib.java/video_capture_module_java.jar <(android_webrtc_demo_root)/libs/ &&' - 'cp <(PRODUCT_DIR)/lib.java/video_render_module_java.jar <(android_webrtc_demo_root)/libs/ &&' - '<(android_strip) -o <(android_webrtc_demo_root)/libs/<(android_app_abi)/libwebrtcdemo-jni.so <(PRODUCT_DIR)/libwebrtcdemo-jni.so && ' - 'cd <(android_webrtc_demo_root) && ' - 'ant debug && ' - 'cd - && ' - 'cp <(android_webrtc_demo_root)/bin/WebRTCDemo-debug.apk <(_outputs)' - ], + 'action': [ + 'bash', '-ec', + 'rm -fr <(_outputs) <(android_webrtc_demo_root)/{bin,libs} && ' + 'mkdir -p <(INTERMEDIATE_DIR) && ' # Must happen _before_ the cd below + 'mkdir -p <(android_webrtc_demo_root)/libs/<(android_app_abi) && ' + 'cp <(PRODUCT_DIR)/lib.java/audio_device_module_java.jar <(android_webrtc_demo_root)/libs/ &&' + 'cp <(PRODUCT_DIR)/lib.java/video_capture_module_java.jar <(android_webrtc_demo_root)/libs/ &&' + 'cp <(PRODUCT_DIR)/lib.java/video_render_module_java.jar <(android_webrtc_demo_root)/libs/ &&' + '<(android_strip) -o <(android_webrtc_demo_root)/libs/<(android_app_abi)/libwebrtcdemo-jni.so <(PRODUCT_DIR)/libwebrtcdemo-jni.so && ' + 'cd <(android_webrtc_demo_root) && ' + '{ ant -q -l <(ant_log) debug || ' + ' { cat <(ant_log) ; exit 1; } } && ' + 'cd - > /dev/null && ' + 'cp <(android_webrtc_demo_root)/bin/WebRTCDemo-debug.apk <(_outputs)' + ], }, ], },