commit 24ec653bb0c95d0b3dcef87537543969339c77af
author Roshan Pius <rpius@google.com> Wed Nov 27 16:13:05 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 27 16:13:05 2024 +0000
tree ec80e0f4326ea90d6684e743c280264e0271710f
parent 7bd823df66c62319f10d82f75ff8388b5d5afdff
parent 68ca86654b4726bbb0091df57ca00cd66a2ba8b9

Merge "Update NFC AIDL module to target SDK 35" into main am: 43a2bd1ae9 am: 68ca86654b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3377057

Change-Id: I599be0d155f27f169ea518efadf29d76103da6a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

nfc/aidl/Android.bp

diff --git a/nfc/aidl/Android.bp b/nfc/aidl/Android.bp
index b34e4f2..1ffd274 100644
--- a/nfc/aidl/Android.bp
+++ b/nfc/aidl/Android.bp
@@ -33,8 +33,9 @@
             enabled: false,
         },
         java: {
-            sdk_version: "module_current",
             enabled: false,
+            sdk_version: "module_current",
+            min_sdk_version: "35",
         },
         ndk: {
             enabled: true,
@@ -42,6 +43,7 @@
                 "//apex_available:platform",
                 "com.android.nfcservices",
             ],
+            min_sdk_version: "35",
         },
         rust: {
             enabled: true,