diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-18 17:18:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 17:18:10 +0000 |
| commit | 7e57780ddde6ead01ac5fbf39a35846185dd1dfd (patch) | |
| tree | 399e90b81fe2f2f602474137595bde47b4b35738 | |
| parent | 5b622bb7bf89da16b21865fef6ad1ab0f2e8b3b8 (diff) | |
| parent | e4fe4b211db8a5a6dcec3002f717d0a092576255 (diff) | |
Merge "Set min_sdk_version to be part of mainline modules" am: 7bca9bf7de am: e4fe4b211d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1336117
Change-Id: I5ee224d768e9958cf3321f13236b5ea473e33d66
| -rw-r--r-- | core/proto/android/server/connectivity/Android.bp | 2 | ||||
| -rw-r--r-- | proto/Android.bp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/proto/android/server/connectivity/Android.bp b/core/proto/android/server/connectivity/Android.bp index 413623963851..50c238b96307 100644 --- 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", } diff --git a/proto/Android.bp b/proto/Android.bp index 01a72eaa6bf8..86d8ee3a662f 100644 --- 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 { |