Source release 17.1.2

oemcrypto/test/fuzz_tests/README.md

@@ -127,8 +127,7 @@ OEMCrypto implementations on linux.
     information locally.
 
 *   Build and test fuzz scripts locally using following commands. The build
-    script builds fuzz binaries for both oemcrypto reference implementation
-    as well as opk implementation.
+    script builds fuzz binaries for opk implementation.
 
     ```shell
     $ cd PATH_TO_CDM_DIR

oemcrypto/test/fuzz_tests/build_oemcrypto_fuzztests

@@ -6,18 +6,21 @@
 
 set -ex
 
+# CDM_DIR is used by several script, especially when there is some confusion
+if [ -z "$CDM_DIR" ]; then
+  export CDM_DIR="$(readlink -e $(dirname $0)/../../..)"
+fi
+cd $CDM_DIR
+
 export CXX=clang++
 export CC=clang
 export GYP_DEFINES="$GYP_DEFINES clang=1"
-export PATH_TO_CDM_DIR=.
-export PYTHONPATH="$PYTHONPATH:$PATH_TO_CDM_DIR/third_party"
+echo "CDM_DIR = $CDM_DIR"
+export PYTHONPATH="$PYTHONPATH:$CDM_DIR/third_party"
 
-python3 $PATH_TO_CDM_DIR/third_party/gyp/__init__.py --format=ninja \
-    --depth=$(pwd) oemcrypto/test/fuzz_tests/oemcrypto_fuzztests.gyp
-ninja -C out/Default
 # oemcrypto_opk_fuzztests.gypi has flags to instrument all the gyp targets
 # with fuzzer flags.
-python3 $PATH_TO_CDM_DIR/third_party/gyp/__init__.py --format=ninja \
+python3 $CDM_DIR/third_party/gyp/__init__.py --format=ninja \
     --depth=$(pwd) \
     --include=oemcrypto/test/fuzz_tests/oemcrypto_opk_fuzztests.gypi \
     oemcrypto/test/fuzz_tests/oemcrypto_opk_fuzztests.gyp