aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-06-22 01:29:40 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-06-22 01:29:40 +0000
commit44f4ecfe9bdf9ea164976fc1f32c5c15a08b14e7 (patch)
tree1465e6f687e1803c9a1c73bbe53609b804e7491f
parentdbdaf1a523fbb663dd9fd30533e64724c57095e9 (diff)
parent74163e065b719dab1dce8a06cb59b7fbd5ec0fb4 (diff)
downloadDnsResolver-44f4ecfe9bdf9ea164976fc1f32c5c15a08b14e7.tar.gz
Merge "Revert "Revert "DnsResolver: bump min sdk 29(Q) to 30(R)"""
-rw-r--r--Android.bp22
1 files changed, 11 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index beead98b..324d7054 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,8 +44,8 @@ cc_library_headers {
cc_library_headers {
name: "dnsproxyd_protocol_headers",
- sdk_version: "29",
- min_sdk_version: "29",
+ sdk_version: "30",
+ min_sdk_version: "30",
export_include_dirs: ["include/dnsproxyd_protocol"],
apex_available: [
"//apex_available:platform",
@@ -63,7 +63,7 @@ cc_library_static {
apex_available: [
"com.android.resolv",
],
- min_sdk_version: "29",
+ min_sdk_version: "30",
}
aidl_interface {
@@ -93,7 +93,7 @@ aidl_interface {
apex_available: [
"com.android.resolv",
],
- min_sdk_version: "29",
+ min_sdk_version: "30",
},
},
versions: [
@@ -129,7 +129,7 @@ cc_defaults {
"liblog",
],
// This field is required to make test compatible with Q devices.
- min_sdk_version: "29",
+ min_sdk_version: "30",
}
cc_defaults {
@@ -275,7 +275,7 @@ cc_library {
cfi: true,
},
apex_available: ["com.android.resolv"],
- min_sdk_version: "29",
+ min_sdk_version: "30",
}
cc_library_static {
@@ -289,7 +289,7 @@ cc_library_static {
"stats.proto",
],
apex_available: ["com.android.resolv"],
- min_sdk_version: "29",
+ min_sdk_version: "30",
}
genrule {
@@ -326,7 +326,7 @@ cc_library_static {
"libgtest_prod_headers", // Used by libstatspush_compat
],
apex_available: ["com.android.resolv"],
- min_sdk_version: "29",
+ min_sdk_version: "30",
}
filegroup {
@@ -385,7 +385,7 @@ rust_ffi_static {
"//apex_available:platform", // Needed by doh_ffi_test
"com.android.resolv",
],
- min_sdk_version: "29",
+ min_sdk_version: "30",
}
rust_test {
@@ -396,7 +396,7 @@ rust_test {
test_suites: ["general-tests"],
auto_gen_config: true,
rustlibs: doh_rust_deps + ["libquiche_static"],
- min_sdk_version: "29",
+ min_sdk_version: "30",
}
// It's required by unit tests.
@@ -415,7 +415,7 @@ rust_ffi_static {
"//apex_available:platform", // Needed by doh_ffi_test
"com.android.resolv",
],
- min_sdk_version: "29",
+ min_sdk_version: "30",
}
rust_ffi_static {