diff --git a/.gitignore b/.gitignore
index 57ff375f5..359de3302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,8 @@
 /third_party/yasm
 /third_party/WebKit/Tools/Scripts
 /tools/clang
+/tools/grit
+/tools/gritsettings
 /tools/gyp
 /tools/python
 /tools/valgrind
diff --git a/webrtc/video_engine/test/android/android_video_demo.gypi b/webrtc/video_engine/test/android/android_video_demo.gypi
new file mode 100644
index 000000000..fabf485a2
--- /dev/null
+++ b/webrtc/video_engine/test/android/android_video_demo.gypi
@@ -0,0 +1,33 @@
+# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+{
+  'targets': [
+    {
+      'target_name': 'video_demo_apk',
+      'type': 'none',
+      'dependencies': [
+        '<(webrtc_root)/modules/modules.gyp:*',
+        '<(webrtc_root)/test/channel_transport.gyp:channel_transport',
+        '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core',
+        '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine_core',
+      ],
+      'actions': [
+        {
+          # TODO(leozwang): Convert building of the demo to a proper GYP target
+          # so this action and the custom build script is not needed.
+          'action_name': 'build_video_demo_apk',
+          'inputs' : [],
+          'outputs': ['<(webrtc_root)'],
+          'action': ['python',
+                     '<(webrtc_root)/video_engine/test/android/build_demo.py'],
+        },
+      ],
+    },
+  ],
+}
+
diff --git a/webrtc/video_engine/video_engine.gyp b/webrtc/video_engine/video_engine.gyp
index 6e72dd551..c0be24585 100644
--- a/webrtc/video_engine/video_engine.gyp
+++ b/webrtc/video_engine/video_engine.gyp
@@ -18,6 +18,13 @@
         'test/libvietest/libvietest.gypi',
         'test/auto_test/vie_auto_test.gypi',
       ],
+      'conditions': [
+        ['OS=="android"', {
+          'includes': [
+            'test/android/android_video_demo.gypi',
+          ],
+        }],
+      ],
     }],
   ],
 }