diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-14 14:04:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-14 14:04:37 +0000 |
| commit | 0ef7b0d46ef8cf5d80e1d042cfdf1f1fae17c40a (patch) | |
| tree | 0c804de7b52b0ef72726ba297e43cd96b0fa5abd | |
| parent | 52f7022db3ae774d0cb1f8dd1cb86d741edab4ba (diff) | |
| parent | 103dbe38b44281b5ad8262370380ae0fc683408e (diff) | |
Merge "Use embedded native libs for NetworkStack.apk." into qt-dev
| -rw-r--r-- | packages/NetworkStack/Android.bp | 1 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifest.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp index c3051245e723..64718da8333b 100644 --- a/packages/NetworkStack/Android.bp +++ b/packages/NetworkStack/Android.bp @@ -118,6 +118,7 @@ android_app { defaults: ["NetworkStackAppCommon"], certificate: "networkstack", manifest: "AndroidManifest.xml", + use_embedded_native_libs: true, } genrule { diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml index 252b90fea840..bfcd6c1baba3 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"/> |