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

Commit 333377b4 authored by Xin Li's avatar Xin Li
Browse files

Merge Android R 

Bug: 168057903
Merged-In: I84f04ecdd900ae5f77f409c8b325f9a447afb8a3
Change-Id: I1c653e4047b1aeac0d5520f10c4565deaccf948f
parents 66707820 9a057c71

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ aidl_interface { 
            apex_available: [

                "//apex_available:platform",

                "com.android.bluetooth.updatable",

                "com.android.wifi",

            ],

        },

        ndk: {

apex/AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ 
    * The interface between the resolver and netd is backwards compatible, so the resolver APEX

    * can work with any version of netd.

    -->

  <uses-sdk

      android:minSdkVersion="29"

  <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 -->

  <!--uses-sdk

      android:targetSdkVersion="29"

  />

  -->

</manifest>

apex/manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.resolv",

  "version": 299900000

  "version": 300000000

}