commit 8ead7ab7a256e0044f1b5263cb82d764c0a6130d
author Richard Uhler <ruhler@google.com> Tue May 14 14:22:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 14 14:22:05 2019 +0000
tree 1c20d4165b6f4951952a1bdf9984573cd489b157
parent cfcbda3345580641ec75f0ec0dfefd7047fe1d3d
parent 87462d79ffc77b431916b10871a2db1da1884283

Merge "Use embedded native libs for NetworkStack.apk."

packages/NetworkStack/Android.bp

diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp
index 62de2ba..9c8efe6 100644
--- a/packages/NetworkStack/Android.bp
+++ b/packages/NetworkStack/Android.bp
@@ -116,6 +116,7 @@
     defaults: ["NetworkStackAppCommon"],
     certificate: "networkstack",
     manifest: "AndroidManifest.xml",
+    use_embedded_native_libs: true,
 }
 
 genrule {

packages/NetworkStack/AndroidManifest.xml

diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml
index 3fc1e98..3b39cee 100644
--- a/packages/NetworkStack/AndroidManifest.xml
+++ b/packages/NetworkStack/AndroidManifest.xml
@@ -37,7 +37,7 @@
     <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
     <!-- Signature permission defined in NetworkStackStub -->
     <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />
-    <application>
+    <application android:extractNativeLibs="false">
         <service android:name="com.android.server.NetworkStackService">
             <intent-filter>
                 <action android:name="android.net.INetworkStackConnector"/>