Merge "Set min_sdk_version to be part of mainline modules" am: 7bca9bf7de am: e4fe4b211d am: 7e57780ddd am: 9031d8f8a8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1336117 Change-Id: Ib519292a17b1b6895793c92b97a198625b4da8c1
2020-06-18 17:41:40 +00:00
parent 5a1d171346 9031d8f8a8
commit f972149c53
2 changed files with 4 additions and 0 deletions
--- a/core/proto/android/server/connectivity/Android.bp
+++ b/core/proto/android/server/connectivity/Android.bp
@@ -21,4 +21,6 @@ java_library_static {
        "data_stall_event.proto",
    ],
    sdk_version: "system_current",
+    // this is part of updatable modules(NetworkStack) which targets 29(Q)
+    min_sdk_version: "29",
 }
--- a/proto/Android.bp
+++ b/proto/Android.bp
@@ -26,6 +26,8 @@ java_library_static {
    },
    srcs: ["src/metrics_constants/metrics_constants.proto"],
    sdk_version: "system_current",
+    // this is part of updatable modules(CaptivePortalLogin) which targets 29(Q)
+    min_sdk_version: "29",
 }

 filegroup {