commit 9456776171c8281a84afc43c06a3b1b81f75af1d
author fischman@webrtc.org <fischman@webrtc.org> Fri Dec 20 22:49:35 2013 +0000
committer fischman@webrtc.org <fischman@webrtc.org> Fri Dec 20 22:49:35 2013 +0000
tree 80809a8479b38d802ce6677b89220688ace45158
parent 748625e0227d89b8aa237d0a73306a066ee01b71

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/webrtc@5332 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc_examples.gyp

diff --git a/webrtc_examples.gyp b/webrtc_examples.gyp
index 84ac3ba..328681a 100644
--- a/webrtc_examples.gyp
+++ b/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)'
+              ],
             },
           ],
         },