Address missing dependencies or executables
[ Merge of http://go/wvgerrit/195850 ] Since Widevine device builds now include APEX prebuilts, shared library dependencies for the prebuilts are in are in /apex/com.google.android.widevine/lib[64] rather than /system/lib[64] or /vendor/lib[64]. When tests are run not all the dependencies are present. These changes include * Statically linking missing dependencies * Adding /apex/com.google.android.widevine/lib[64] to the shared library path * Searching for some of the test executables in /data/nativetest[64]/vendor/ Bug: 329888778 Bug: 329891889 Bug: 329891175 Bug: 329891049 Test: ./build_and_run_all_unit_tests.sh Change-Id: I067685cedc7701c4e6502bdac98b53e22b61ad1e
This commit is contained in:
@@ -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 \
|
||||
wv_media_drm_flags_c_lib \
|
||||
|
||||
LOCAL_HEADER_LIBRARIES := \
|
||||
|
||||
Reference in New Issue
Block a user