diff options
| author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-07-22 14:11:57 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-07-22 14:11:57 +0000 |
| commit | 93efc285cdbf07fc98a5a272e320e4789b201d81 (patch) | |
| tree | 40c623ddebe88d7a978e981c299933d575d7a38d | |
| parent | b76f870a57a9e40c55c9a4317a3401485c48c340 (diff) | |
| parent | 1edfc7e5d691ee7d8e7849cfe840121fb1a2d977 (diff) | |
| download | cbor-java-93efc285cdbf07fc98a5a272e320e4789b201d81.tar.gz | |
[automerge] Fixes build issues 2p: 1edfc7e5d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/19394291
Bug: 239863396
Change-Id: I312d1063cd6667f5f5fb8b0875e3e322e2dea6e3
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | AndroidManifest.xml | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -38,6 +38,8 @@ java_library { "src/main/**/*.java", ], min_sdk_version: "30", + // Setting target sdk to 10000 to prevent issues such as b/220675744 + target_sdk_version: "10000", sdk_version: "core_current", apex_available: [ "//apex_available:platform", @@ -61,6 +63,8 @@ android_test { "com.google.android.adservices.apex" ], min_sdk_version: "30", + // Setting target sdk to 10000 to prevent issues such as b/220675744 + target_sdk_version: "10000", sdk_version: "test_current", test_suites: [ "general-tests", diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5009bad..f5e6a1a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,7 +18,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="co.nstant.in.cbor" > - <uses-sdk android:minSdkVersion="30" /> <application /> <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" |