commit 0ef7b0d46ef8cf5d80e1d042cfdf1f1fae17c40a
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 14 14:04:37 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 14 14:04:37 2019 +0000
tree 0c804de7b52b0ef72726ba297e43cd96b0fa5abd
parent 52f7022db3ae774d0cb1f8dd1cb86d741edab4ba
parent 103dbe38b44281b5ad8262370380ae0fc683408e

Merge "Use embedded native libs for NetworkStack.apk." into qt-dev

packages/NetworkStack/Android.bp

diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp
index c305124..64718da 100644
--- a/packages/NetworkStack/Android.bp
+++ b/packages/NetworkStack/Android.bp
@@ -118,6 +118,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 252b90f..bfcd6c1 100644
--- a/packages/NetworkStack/AndroidManifest.xml
+++ b/packages/NetworkStack/AndroidManifest.xml
@@ -41,7 +41,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"/>