Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5f8c737 authored by Richard Uhler's avatar Richard Uhler
Browse files

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
parent d013e718

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ android_app { 
    defaults: ["NetworkStackAppCommon"],

    certificate: "networkstack",

    manifest: "AndroidManifest.xml",

    use_embedded_native_libs: true,

}



genrule {

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"/>