From 3145a642b73d7a7b72829120d23b4cf381f05ec6 Mon Sep 17 00:00:00 2001
From: "fischman@webrtc.org"
 <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 26 Jun 2013 20:20:05 +0000
Subject: [PATCH] Correctly rebuild WebRTCDemo-debug.apk after modules/ source
 file changes.

BUG=1980
R=braveyao@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4270 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../test/android/android_video_demo.gypi      | 78 +++++++++++++++++--
 .../video_engine/test/android/jni/Android.mk  |  1 -
 2 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/webrtc/video_engine/test/android/android_video_demo.gypi b/webrtc/video_engine/test/android/android_video_demo.gypi
index c7f3ed1a18..0378ad3582 100644
--- a/webrtc/video_engine/test/android/android_video_demo.gypi
+++ b/webrtc/video_engine/test/android/android_video_demo.gypi
@@ -6,15 +6,81 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 {
+  'variables': {
+    # NOTE: This laundry list of libs comes from jni/Android.mk and should be
+    # kept in sync with that location.  Also note that the explicit library
+    # names must be used (instead of the names of their gyp targets) because
+    # these are fed into the 'inputs' attribute of the action below, not to
+    # 'dependencies' because these need to be real (build-time) dependencies,
+    # not just order-only dependencies
+    # (https://code.google.com/p/webrtc/issues/detail?id=1980).
+    'android_mk_common_libs': [
+      '<(PRODUCT_DIR)/libvoice_engine.a',
+      '<(PRODUCT_DIR)/libvideo_engine_core.a',
+      '<(PRODUCT_DIR)/libvideo_processing.a',
+      '<(PRODUCT_DIR)/libwebrtc_video_coding.a',
+      '<(PRODUCT_DIR)/libvideo_render_module.a',
+      '<(PRODUCT_DIR)/libvideo_capture_module.a',
+      '<(PRODUCT_DIR)/libaudio_coding_module.a',
+      '<(PRODUCT_DIR)/libaudio_processing.a',
+      '<(PRODUCT_DIR)/libPCM16B.a',
+      '<(PRODUCT_DIR)/libCNG.a',
+      '<(PRODUCT_DIR)/libNetEq.a',
+      '<(PRODUCT_DIR)/libG722.a',
+      '<(PRODUCT_DIR)/libiSAC.a',
+      '<(PRODUCT_DIR)/libG711.a',
+      '<(PRODUCT_DIR)/libiLBC.a',
+      '<(PRODUCT_DIR)/libiSACFix.a',
+      '<(PRODUCT_DIR)/libwebrtc_opus.a',
+      '<(PRODUCT_DIR)/libopus.a',
+      '<(PRODUCT_DIR)/libcommon_audio.a',
+      '<(PRODUCT_DIR)/libbitrate_controller.a',
+      '<(PRODUCT_DIR)/libcommon_video.a',
+      '<(PRODUCT_DIR)/libcpu_features_android.a',
+      '<(PRODUCT_DIR)/libaudio_device.a',
+      '<(PRODUCT_DIR)/libremote_bitrate_estimator.a',
+      '<(PRODUCT_DIR)/librtp_rtcp.a',
+      '<(PRODUCT_DIR)/libmedia_file.a',
+      '<(PRODUCT_DIR)/libchannel_transport.a',
+      '<(PRODUCT_DIR)/libwebrtc_utility.a',
+      '<(PRODUCT_DIR)/libaudio_conference_mixer.a',
+      '<(PRODUCT_DIR)/libyuv.a',
+      '<(PRODUCT_DIR)/libwebrtc_i420.a',
+      '<(PRODUCT_DIR)/libwebrtc_vp8.a',
+      '<(PRODUCT_DIR)/libvideo_coding_utility.a',
+      '<(PRODUCT_DIR)/libsystem_wrappers.a',
+      '<(PRODUCT_DIR)/libjpeg_turbo.a',
+      '<(PRODUCT_DIR)/libaudioproc_debug_proto.a',
+      '<(PRODUCT_DIR)/libprotobuf_lite.a',
+      '<(PRODUCT_DIR)/libpaced_sender.a',
+      '<(PRODUCT_DIR)/libvpx.a',
+    ],
+    'android_mk_x86_libs': [
+      '<(PRODUCT_DIR)/libvideo_processing_sse2.a',
+      '<(PRODUCT_DIR)/libaudio_processing_sse2.a',
+      '<(PRODUCT_DIR)/libcommon_audio_sse2.a',
+      '<(PRODUCT_DIR)/libvpx_intrinsics_mmx.a',
+      '<(PRODUCT_DIR)/libvpx_intrinsics_sse2.a',
+      '<(PRODUCT_DIR)/libvpx_intrinsics_ssse3.a',
+    ],
+    'android_mk_arm_libs': [
+      '<(PRODUCT_DIR)/libaudio_processing_neon.a',
+      '<(PRODUCT_DIR)/libisac_neon.a',
+      '<(PRODUCT_DIR)/libcommon_audio_neon.a',
+      '<(PRODUCT_DIR)/libvpx_arm_neon.a',
+    ],
+  },
+
   'targets': [
     {
       'target_name': 'video_demo_apk',
       'type': 'none',
-      'dependencies': [
-        '<(webrtc_root)/modules/modules.gyp:*',
-        '<(webrtc_root)/test/test.gyp:channel_transport',
-        '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core',
-        '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
+      'conditions': [
+        ['target_arch=="x86"', {
+          'inputs': [ '<@(android_mk_x86_libs)' ],
+        }, {
+          'inputs': [ '<@(android_mk_arm_libs)' ],
+        }],
       ],
       'actions': [
         {
@@ -33,6 +99,7 @@
             '<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengineapp/IViEAndroidCallback.java',
             '<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java',
             '<(webrtc_root)/video_engine/test/android/src/org/webrtc/videoengineapp/WebRTCDemo.java',
+            '<@(android_mk_common_libs)',
           ],
           'outputs': ['<(webrtc_root)'],
           'action': ['python',
@@ -43,4 +110,3 @@
     },
   ],
 }
-
diff --git a/webrtc/video_engine/test/android/jni/Android.mk b/webrtc/video_engine/test/android/jni/Android.mk
index 35270510e0..5e6cd0b373 100644
--- a/webrtc/video_engine/test/android/jni/Android.mk
+++ b/webrtc/video_engine/test/android/jni/Android.mk
@@ -386,7 +386,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
     libremote_bitrate_estimator \
     librtp_rtcp \
     libmedia_file \
-    libudp_transport \
     libchannel_transport \
     libwebrtc_utility \
     libaudio_conference_mixer \