summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-05-14 14:04:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-14 14:04:37 +0000
commit544ad30499aeebfca129a66ab262b80f37903517 (patch)
tree8f0595749b2302a13bdd62e7079fe23ae9d39610
parentd680e28c6a8f677b97e5b2401ecd7094c9398d44 (diff)
parente5f8c73758eafb86f9abee8ba81e688f5dbe9f4d (diff)
Merge "Use embedded native libs for NetworkStack.apk." into qt-dev
-rw-r--r--Android.bp1
-rw-r--r--AndroidManifest.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index c305124..64718da 100644
--- a/Android.bp
+++ b/Android.bp
@@ -118,6 +118,7 @@ android_app {
defaults: ["NetworkStackAppCommon"],
certificate: "networkstack",
manifest: "AndroidManifest.xml",
+ use_embedded_native_libs: true,
}
genrule {
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 252b90f..bfcd6c1 100644
--- a/AndroidManifest.xml
+++ b/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"/>