Merge "Address missing dependencies or executables" into udc-widevine-dev

libwvdrmengine/build_all_unit_tests.sh

@@ -98,7 +98,11 @@ fi
 # If that fails, an error message will be printed.
 try_adb_push() {
   # android-tests.zip requires /data/nativetest, we should use the same
-  if [ -f $OUT/data/nativetest/$1 ]; then
+  if [ -f $OUT/data/nativetest64/$1 ]; then
+    test_file=$OUT/data/nativetest64/$1
+  elif [ -f $OUT/data/nativetest64/vendor/$1/$1 ]; then
+    test_file=$OUT/data/nativetest64/vendor/$1/$1
+  elif [ -f $OUT/data/nativetest/$1 ]; then
     test_file=$OUT/data/nativetest/$1
   elif [ -f $OUT/data/nativetest/vendor/$1/$1 ]; then
     test_file=$OUT/data/nativetest/vendor/$1/$1

libwvdrmengine/mediacrypto/test/Android.mk

@@ -25,11 +25,15 @@ LOCAL_STATIC_LIBRARIES := \
   libcdm_protos \
   libcdm_utils \
   libjsmn \
+  libjsoncpp \
   libgmock \
   libgmock_main \
   libgtest \
+  libwvaidl \
+  libwvdrmcryptoplugin_aidl \
   libwvlevel3 \
   libwv_odk \
+  libPlatformProperties \
 
 LOCAL_SHARED_LIBRARIES := \
   android.hardware.drm-V1-ndk \
@@ -41,7 +45,6 @@ LOCAL_SHARED_LIBRARIES := \
   liblog \
   libprotobuf-cpp-lite \
   libutils \
-  libwvaidl \
 
 LOCAL_HEADER_LIBRARIES := \
   libstagefright_headers \

libwvdrmengine/mediadrm/test/Android.mk

@@ -22,14 +22,20 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES := \
   libcdm \
+  libcdm_utils \
+  libcutils \
   libcdm_protos \
   libcdm_utils \
   libjsmn \
+  libjsoncpp \
   libgmock \
   libgmock_main \
   libgtest \
+  libwvaidl \
+  libwvdrmdrmplugin_aidl \
   libwvlevel3 \
   libwv_odk \
+  libPlatformProperties \
 
 LOCAL_SHARED_LIBRARIES := \
   android.hardware.drm-V1-ndk \
@@ -40,7 +46,6 @@ LOCAL_SHARED_LIBRARIES := \
   liblog \
   libprotobuf-cpp-lite \
   libutils \
-  libwvaidl \
 
 LOCAL_HEADER_LIBRARIES := \
   libstagefright_headers \
@@ -91,6 +96,8 @@ LOCAL_STATIC_LIBRARIES := \
   libgtest \
   libgtest_main \
   libjsmn \
+  libwvaidl \
+  libwvdrmdrmplugin_aidl \
   libwvlevel3 \
   libwv_odk \
 
@@ -100,7 +107,6 @@ LOCAL_SHARED_LIBRARIES := \
   liblog \
   libprotobuf-cpp-lite \
   libutils \
-  libwvaidl \
 
 LOCAL_C_INCLUDES += \
   external/protobuf/src \

libwvdrmengine/run_all_unit_tests.sh

@@ -27,7 +27,8 @@ elif [ 0 -eq `expr index "$GTEST_FILTER" "-"` ]; then
 fi
 
 # The Android supplement allows for installation in these paths:
-OEC_PATHS=/vendor/lib64:/vendor/lib:/system/lib64/vndk-R:/system/lib/vndk-R
+OEC_PATHS=/apex/com.google.android.widevine/lib64:/apex/com.google.android.widevine/lib:
+OEC_PATHS+=/system/lib64:/system/lib/:/vendor/lib64:/vendor/lib:/system/lib64/vndk-R:/system/lib/vndk-R
 
 # Execute a command in "adb shell" and capture the result.
 adb_shell_run() {
@@ -49,7 +50,8 @@ adb_shell_run() {
   # to load. We must reverse the library path in this case so we don't attempt
   # to load 64-bit libraries with the 32-bit liboemcrypto.so.
   if ! adb $SERIAL_NUM shell ls /vendor/lib64/liboemcrypto.so &> /dev/null; then
-    OEC_PATHS=/vendor/lib:/vendor/lib64
+    OEC_PATHS=/apex/com.google.android.widevine/lib:/apex/com.google.android.widevine/lib64:
+    OEC_PATHS+=/system/lib:/system/lib64/:/vendor/lib:/vendor/lib64:/system/lib/vndk-R:/system/lib64/vndk-R
   fi
   adb $SERIAL_NUM shell "LD_LIBRARY_PATH=$OEC_PATHS GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log"
   ! grep -Fq "$adb_error" "$tmp_log"

libwvdrmengine/test/unit/Android.mk

@@ -19,18 +19,31 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \
+  libaidlcommonsupport \
   libgtest \
   libgtest_main \
+  libjsmn \
+  libjsoncpp \
+  libcdm \
+  libcdm_protos \
+  libcdm_utils \
+  libwvdrmcryptoplugin_aidl \
+  libwvdrmdrmplugin_aidl \
+  libwvlevel3 \
+  libwv_odk \
+  libwvaidl \
+  libPlatformProperties \
 
 LOCAL_SHARED_LIBRARIES := \
   android.hardware.drm-V1-ndk \
   libbase \
   libbinder_ndk \
   libcrypto \
+  libcutils \
   libdl \
   liblog \
+  libprotobuf-cpp-lite \
   libutils \
-  libwvaidl \
 
 LOCAL_HEADER_LIBRARIES := \
   libstagefright_foundation_headers \