Run-test: Add couple more libraries to testing apex.

We need the libraries (and all the others already in the apex)
for running eng-prod tests.

We want to remove the testing apex, however for the time being
this is the fastest way to deliver the libraries to the device.

Test: atest (with further local changes)
Change-Id: Iedf041cea8293a362c02f32dc765a08d5b361015

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f91b786..3322716 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -339,6 +339,10 @@
     native_shared_libs: [
         "libart",
         "libartd",
+        "libarttest",
+        "libarttestd",
+        "libtiagent",
+        "libtiagentd",
     ],
     multilib: {
         first: {

build/apex/art_apex_test.py

diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 3c39e43..51a4ca0 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -603,6 +603,11 @@
     self._checker.check_art_test_executable('art_runtime_tests')
     self._checker.check_art_test_executable('art_sigchain_tests')
 
+    # Some libraries are in odd location (libarttest(d) and libtiagent(d)).
+    # We intend to remove the whole testing apex, so just ignore those for now.
+    self._checker.ignore_path('lib*/com.android.art')
+    self._checker.ignore_path('lib*/com.android.art/lib*')
+
     # Check ART test tools.
     self._checker.check_executable('signal_dumper')
 

test/default_run.py

diff --git a/test/default_run.py b/test/default_run.py
index 21673f7..a0756a3 100755
--- a/test/default_run.py
+++ b/test/default_run.py
@@ -976,6 +976,9 @@
     # namespace, that gives libarttest(d).so full access to the internal ART
     # libraries.
     LD_LIBRARY_PATH = f"/data/{TEST_DIRECTORY}/com.android.art/lib{SUFFIX64}:{LD_LIBRARY_PATH}"
+    # TODO: Remove once testing apex is gone. The libs are copied into further subdirectory.
+    #       We intend to remove the testing apex, so this should be short lived work-around.
+    LD_LIBRARY_PATH = f"/apex/com.android.art/lib{SUFFIX64}/com.android.art/lib{SUFFIX64}:{LD_LIBRARY_PATH}"
     dlib = ("" if TEST_IS_NDEBUG else "d")
     art_test_internal_libraries = [
         f"libartagent{dlib}.so",