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

Commit 53d4895b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "DnsResolver: bump min sdk 29(Q) to 30(R)""" am:... 

Merge "Revert "Revert "DnsResolver: bump min sdk 29(Q) to 30(R)""" am: 44f4ecfe am: 8a0713dc am: ab15abbf am: 48820d30 am: 1a953832

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2632809



Change-Id: Ife008ed7d8e53ff8dc510bba1635a3b00d472bca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 508d2894 1a953832

Android.bp

+11 −11
Original line number Original line Diff line number Diff line
@@ -44,8 +44,8 @@ cc_library_headers { 




cc_library_headers {

cc_library_headers {

    name: "dnsproxyd_protocol_headers",

    name: "dnsproxyd_protocol_headers",

    sdk_version: "29",

    sdk_version: "30",

    min_sdk_version: "29",

    min_sdk_version: "30",

    export_include_dirs: ["include/dnsproxyd_protocol"],

    export_include_dirs: ["include/dnsproxyd_protocol"],

    apex_available: [

    apex_available: [

        "//apex_available:platform",

        "//apex_available:platform",
@@ -63,7 +63,7 @@ cc_library_static { 
    apex_available: [

    apex_available: [

        "com.android.resolv",

        "com.android.resolv",

    ],

    ],

    min_sdk_version: "29",

    min_sdk_version: "30",

}

}





aidl_interface {

aidl_interface {
@@ -93,7 +93,7 @@ aidl_interface { 
            apex_available: [

            apex_available: [

                "com.android.resolv",

                "com.android.resolv",

            ],

            ],

            min_sdk_version: "29",

            min_sdk_version: "30",

        },

        },

    },

    },

    versions: [

    versions: [
@@ -129,7 +129,7 @@ cc_defaults { 
        "liblog",

        "liblog",

    ],

    ],

    // This field is required to make test compatible with Q devices.

    // This field is required to make test compatible with Q devices.

    min_sdk_version: "29",

    min_sdk_version: "30",

}

}





cc_defaults {

cc_defaults {
@@ -275,7 +275,7 @@ cc_library { 
        cfi: true,

        cfi: true,

    },

    },

    apex_available: ["com.android.resolv"],

    apex_available: ["com.android.resolv"],

    min_sdk_version: "29",

    min_sdk_version: "30",

}

}





cc_library_static {

cc_library_static {
@@ -289,7 +289,7 @@ cc_library_static { 
        "stats.proto",

        "stats.proto",

    ],

    ],

    apex_available: ["com.android.resolv"],

    apex_available: ["com.android.resolv"],

    min_sdk_version: "29",

    min_sdk_version: "30",

}

}





genrule {

genrule {
@@ -326,7 +326,7 @@ cc_library_static { 
        "libgtest_prod_headers", // Used by libstatspush_compat

        "libgtest_prod_headers", // Used by libstatspush_compat

    ],

    ],

    apex_available: ["com.android.resolv"],

    apex_available: ["com.android.resolv"],

    min_sdk_version: "29",

    min_sdk_version: "30",

}

}





filegroup {

filegroup {
@@ -385,7 +385,7 @@ rust_ffi_static { 
        "//apex_available:platform", // Needed by doh_ffi_test

        "//apex_available:platform", // Needed by doh_ffi_test

        "com.android.resolv",

        "com.android.resolv",

    ],

    ],

    min_sdk_version: "29",

    min_sdk_version: "30",

}

}





rust_test {

rust_test {
@@ -396,7 +396,7 @@ rust_test { 
    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

    auto_gen_config: true,

    auto_gen_config: true,

    rustlibs: doh_rust_deps + ["libquiche_static"],

    rustlibs: doh_rust_deps + ["libquiche_static"],

    min_sdk_version: "29",

    min_sdk_version: "30",

}

}





// It's required by unit tests.

// It's required by unit tests.
@@ -415,7 +415,7 @@ rust_ffi_static { 
        "//apex_available:platform", // Needed by doh_ffi_test

        "//apex_available:platform", // Needed by doh_ffi_test

        "com.android.resolv",

        "com.android.resolv",

    ],

    ],

    min_sdk_version: "29",

    min_sdk_version: "30",

}

}





rust_ffi_static {

rust_ffi_static {