aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Saldivar <jorgesaldivar@google.com>2022-07-22 14:06:52 +0000
committerJorge Saldivar <jorgesaldivar@google.com>2022-07-22 14:11:19 +0000
commit1edfc7e5d691ee7d8e7849cfe840121fb1a2d977 (patch)
tree40c623ddebe88d7a978e981c299933d575d7a38d
parentaeff2df88f2b41be4ed557c4236dae6bb4c3fcc0 (diff)
downloadcbor-java-1edfc7e5d691ee7d8e7849cfe840121fb1a2d977.tar.gz
Fixes build issues
Bug: 239863396 Test: mma Change-Id: I2bd0acdd4c787befd33ea216c6993f1525a54bc2
-rw-r--r--Android.bp4
-rw-r--r--AndroidManifest.xml1
2 files changed, 4 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 3386f9d..3b27e4d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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"