diff options
| author | 2022-07-04 14:29:59 +0000 | |
|---|---|---|
| committer | 2022-07-04 14:29:59 +0000 | |
| commit | b8426673b23ef7621fbd7d842772b6c7c4ed83b6 (patch) | |
| tree | fff1067be1b92aa4821ce80383dd4e36d24d44c1 | |
| parent | defaacd0b724e198e8417c28a70dd272a46016f4 (diff) | |
| parent | 8fe47dd0b83c2531793ebbef0935c57c15d95908 (diff) | |
Merge "Set min_sdk_version" am: 8fe47dd0b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2138336
Change-Id: Ib7f25d4224e481fa12162c3acd920c771a070cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | libs/protoutil/Android.bp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 034aea2ee4a4..d8848029af3e 100644 --- a/Android.bp +++ b/Android.bp @@ -305,6 +305,7 @@ java_defaults { "contacts-provider-platform-compat-config", ], libs: [ + "androidx.annotation_annotation", "app-compat-annotations", "ext", "framework-updatable-stubs-module_libs_api", diff --git a/libs/protoutil/Android.bp b/libs/protoutil/Android.bp index 132d71eb6db8..128be3c33ac5 100644 --- a/libs/protoutil/Android.bp +++ b/libs/protoutil/Android.bp @@ -55,6 +55,7 @@ cc_library { export_include_dirs: ["include"], + min_sdk_version: "30", apex_available: [ "//apex_available:platform", "com.android.os.statsd", @@ -81,5 +82,5 @@ cc_test { proto: { type: "full", - } + }, } |