diff --git a/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_1280x720_mp4_mpeg2_3000kbps_30fps_aac_stereo_128kbps_48000hz.mp4 b/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_1280x720_mp4_mpeg2_3000kbps_30fps_aac_stereo_128kbps_48000hz.mp4
new file mode 100644
index 0000000..0490c74
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_1280x720_mp4_mpeg2_3000kbps_30fps_aac_stereo_128kbps_48000hz.mp4
Binary files differ
diff --git a/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp b/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp
new file mode 100644
index 0000000..61e90a6
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_176x144_3gp_h263_56kbps_12fps_aac_stereo_128kbps_22050hz.3gp
Binary files differ
diff --git a/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp b/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp
new file mode 100644
index 0000000..b39c665
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/ESDS/ESDSTestRes/video_176x144_3gp_h263_56kbps_25fps_aac_mono_24kbps_11025hz.3gp
Binary files differ
diff --git a/frameworks/av/media/libstagefright/tests/ESDS/build.sh b/frameworks/av/media/libstagefright/tests/ESDS/build.sh
new file mode 100755
index 0000000..6f0c2f5
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/ESDS/build.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# build a current zip file
+#
+# parameters
+
+if [ ! -f ./parameters ] ; then
+    echo Missing parameter file parameters
+    exit 1
+fi
+source ./parameters
+
+if [ "${DIR}" = "" ] ; then
+    echo Missing DIR from parameters
+    exit 1
+fi
+if [ "${VERSION}" = "" ] ; then
+    echo Missing VERSION from parameters
+    exit 1
+fi
+
+if [ ! -d "${DIR}" ] ; then
+    echo Missing extractor test data directory: ${DIR}
+    exit 1
+fi
+
+rm -f ${DIR}-${VERSION}.zip
+(cd ./${DIR} && zip -r ../${DIR}-${VERSION}.zip .)
+
+echo all good
diff --git a/frameworks/av/media/libstagefright/tests/ESDS/parameters b/frameworks/av/media/libstagefright/tests/ESDS/parameters
new file mode 100644
index 0000000..e2265c5
--- /dev/null
+++ b/frameworks/av/media/libstagefright/tests/ESDS/parameters
@@ -0,0 +1,3 @@
+DIR=ESDSTestRes
+VERSION=1.0
+DEST="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/tests/ESDS/${DIR}-${VERSION}.zip"