commit 103dbe38b44281b5ad8262370380ae0fc683408e
author Richard Uhler <ruhler@google.com> Mon May 13 16:05:51 2019 +0100
committer Richard Uhler <ruhler@google.com> Mon May 13 16:08:58 2019 +0100
tree d729947a07054ad0d44d9e1789d9089883d2da66
parent d7affe71710d08ae738c353411571a60c56e6172

Use embedded native libs for NetworkStack.apk.

So that the /system version of NetworkStack.apk can be re-installed on
/data without causing problems. This is useful for testing and necessary
for supporting rollback to the system version of NetworkStack.apk.

Bug: 131703417
Bug: 132195177
Test: Confirm NetworkStack.apk now includes .so files.
Test: adb install --staged NetworkStack.apk
      adb reboot
      Device reboots without problems.

Change-Id: I7c9a1702a2c18e0333b5e409f04b7658fe685f97

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 {