From 4478840931423f31351af8ec370a4421a460651b Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Fri, 4 Aug 2017 12:12:25 +0900 Subject: [PATCH] DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies Rational for do not merge: the list of native libraries needed in Android.mk is not consistent at the moment for aosp master and for internal branches. Furthermore it is not consistent within internal branches either. This patch only attempts to fix the tests of the branches where it matters for development. Otherwise the cost of merge conflicts makes it undesirable. Test: All tests in runtest frameworks-net pass. Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708 (cherry pick from commit 99e8ab6e46eec5dbd1b059b3732672d537b3cf34) Change-Id: Ic732b3dafc3497235e455b8748ac4f99cf02b221 --- tests/net/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/net/Android.mk b/tests/net/Android.mk index 8aa27a9559b88..bf558c2c3eaa1 100644 --- a/tests/net/Android.mk +++ b/tests/net/Android.mk @@ -40,7 +40,8 @@ LOCAL_JNI_SHARED_LIBRARIES := libframeworksnettestsjni \ libnetdaidl \ libui \ libunwind \ - libutils + libutils \ + libunwindstack LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk