From 76be372bac89003d1ec68470a571b67e3efb5526 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Wed, 30 May 2018 13:52:08 +0900
Subject: [PATCH] Add missing dependencies for libdexfile
Since a dependency was added to libartbase from libdexfile, this test
has been failing because of the missing deps. As discussed both
libartbase and its non-NDK dependencies need to be added.
Bug: b/79785496
Bug: b/80082746
Test: ApfTest and UidRangeTest now pass in master, still pass in aosp
Change-Id: Ia2c140514d7405d701c3ec520b77663abe2b34d5
---
tests/net/Android.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/net/Android.mk b/tests/net/Android.mk
index e682f790a6832..b3a82f5d83921 100644
--- a/tests/net/Android.mk
+++ b/tests/net/Android.mk
@@ -32,6 +32,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 \
@@ -57,7 +59,9 @@ LOCAL_JNI_SHARED_LIBRARIES := \
libvndksupport \
libtinyxml2 \
libunwindstack \
- libutilscallstack
+ libutilscallstack \
+ libziparchive \
+ libz
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
--
GitLab