Merge "Add missing dependencies for libdexfile" am: 286aa939af

am: e78185076c

Change-Id: Icc5446f1ecfb88a292ac63058f7c4f44922e9a89

tests/net/Android.mk

@@ -34,6 +34,8 @@ LOCAL_CERTIFICATE := platform
 # These are not normally accessible from apps so they must be explicitly included.
 LOCAL_JNI_SHARED_LIBRARIES := \
     android.hidl.token@1.0 \
+    $(UBSAN_RUNTIME_LIBRARY) \
+    libartbase \
     libbacktrace \
     libbase \
     libbinder \
@@ -59,7 +61,9 @@ LOCAL_JNI_SHARED_LIBRARIES := \
     libvndksupport \
     libtinyxml2 \
     libunwindstack \
-    libutilscallstack
+    libutilscallstack \
+    libziparchive \
+    libz
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk