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

Commit 7a7668ab authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: I382fd7706a9050c786cc1a3735c7a5864dc1bd04
Change-Id: I3491ff0e2843ba9fc7aeb2dffe4ec0f10a707abd
parents 429321fa 5c3fbfc5

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ cc_library_headers { 


cc_library_headers {

    name: "dnsproxyd_protocol_headers",

    sdk_version: "29",

    min_sdk_version: "29",

    export_include_dirs: ["include/dnsproxyd_protocol"],

    apex_available: [

        "//apex_available:platform",
@@ -85,6 +87,7 @@ aidl_interface { 
                "com.android.tethering",

                "com.android.wifi",

            ],

            min_sdk_version: "30",

        },

        ndk: {

            gen_log: true,

apex/manifest.json

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

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

  "version": 309999900

  "version": 319999900

}