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 Bug: 360160204 Test: ./build_and_run_all_unit_tests.sh Change-Id: I067685cedc7701c4e6502bdac98b53e22b61ad1e
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user