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

am: 8ead7ab7a2 Change-Id: I1a6099b9476c23c7566304b9565a06a1b0bec247
2019-05-14 07:45:21 -07:00
parent 9144bdf0e1 8ead7ab7a2
commit f1fe530c7a
2 changed files with 2 additions and 1 deletions
--- a/packages/NetworkStack/Android.bp
+++ b/packages/NetworkStack/Android.bp
@@ -116,6 +116,7 @@ android_app {
    defaults: ["NetworkStackAppCommon"],
    certificate: "networkstack",
    manifest: "AndroidManifest.xml",
+    use_embedded_native_libs: true,
 }

 genrule {
--- 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"/>