From 514a3bfde6ccc8ca80f3bacdd370e2d4672b3d85 Mon Sep 17 00:00:00 2001
From: Paul Jensen <pauljensen@google.com>
Date: Thu, 4 Feb 2016 09:11:40 -0500
Subject: [PATCH] Fix FrameworksServicesTests.apk to include libnativehelper.so

libnativehelper.so is no longer accessible to the app, so it must be
bundled in the app. This should get ApfTest passing again.

Change-Id: Ie4fe66e44d46ddb12b3c7ac5c91118a69a8ebe2e
---
 services/tests/servicestests/Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk
index f933d10e5843..14d8b300db2a 100644
--- a/services/tests/servicestests/Android.mk
+++ b/services/tests/servicestests/Android.mk
@@ -25,7 +25,9 @@ LOCAL_PACKAGE_NAME := FrameworksServicesTests
 
 LOCAL_CERTIFICATE := platform
 
-LOCAL_JNI_SHARED_LIBRARIES := libapfjni
+LOCAL_JNI_SHARED_LIBRARIES := \
+    libapfjni \
+    libnativehelper
 
 include $(BUILD_PACKAGE)
 
-- 
2.11.0