Merge "MediaTranscodingService:test script execute permission."
diff --git a/media/extractors/fuzzers/Android.bp b/media/extractors/fuzzers/Android.bp
index 502743e..a9fc7e4 100644
--- a/media/extractors/fuzzers/Android.bp
+++ b/media/extractors/fuzzers/Android.bp
@@ -132,6 +132,7 @@
cc_fuzz {
name: "wav_extractor_fuzzer",
defaults: ["extractor-fuzzer-defaults"],
+ host_supported: true,
srcs: [
"wav_extractor_fuzzer.cpp",
@@ -154,6 +155,7 @@
cc_fuzz {
name: "amr_extractor_fuzzer",
defaults: ["extractor-fuzzer-defaults"],
+ host_supported: true,
srcs: [
"amr_extractor_fuzzer.cpp",
@@ -173,6 +175,7 @@
cc_fuzz {
name: "mkv_extractor_fuzzer",
defaults: ["extractor-fuzzer-defaults"],
+ host_supported: true,
srcs: [
"mkv_extractor_fuzzer.cpp",
@@ -196,6 +199,7 @@
cc_fuzz {
name: "ogg_extractor_fuzzer",
defaults: ["extractor-fuzzer-defaults"],
+ host_supported: true,
srcs: [
"ogg_extractor_fuzzer.cpp",
@@ -243,6 +247,7 @@
cc_fuzz {
name: "mp3_extractor_fuzzer",
defaults: ["extractor-fuzzer-defaults"],
+ host_supported: true,
srcs: [
"mp3_extractor_fuzzer.cpp",
@@ -262,6 +267,7 @@
cc_fuzz {
name: "aac_extractor_fuzzer",
defaults: ["extractor-fuzzer-defaults"],
+ host_supported: true,
srcs: [
"aac_extractor_fuzzer.cpp",
@@ -280,6 +286,7 @@
cc_fuzz {
name: "flac_extractor_fuzzer",
defaults: ["extractor-fuzzer-defaults"],
+ host_supported: true,
srcs: [
"flac_extractor_fuzzer.cpp",
diff --git a/media/libmediatranscoding/tests/assets/push_assets.sh b/media/libmediatranscoding/tests/assets/push_assets.sh
index 8c85e58..8afc947 100755
--- a/media/libmediatranscoding/tests/assets/push_assets.sh
+++ b/media/libmediatranscoding/tests/assets/push_assets.sh
@@ -19,7 +19,14 @@
adb root && adb wait-for-device remount
fi
-#TODO(hkuang): Check if the destination folder already exists. If so, skip the copying.
echo "Copying files to device"
-adb push $ANDROID_BUILD_TOP/frameworks/av/media/libmediatranscoding/tests/assets/* /data/local/tmp/TranscodingTestAssets
+
+adb shell mkdir -p /data/local/tmp/TranscodingTestAssets
+
+FILES=$ANDROID_BUILD_TOP/frameworks/av/media/libmediatranscoding/tests/assets/*
+for file in $FILES
+do
+adb push --sync $file /data/local/tmp/TranscodingTestAssets
+done
+
echo "Copy done"