commit 7dcb7c568f85cafb65b5e50f944cddcf5b900392
author Steven Moreland <smoreland@google.com> Tue Nov 15 20:43:47 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 15 20:43:47 2022 +0000
tree dae61f908ee5dafd5a30687624dab07db5ee00ac
parent 1dc92fa1079cc1b8b7d6b549691a60b59f58e741
parent 2c3a670cf2dce796d5a687ff133fdf79f2170b0a

hidl2aidl: module_current -> system_current am: 2c3a670cf2

Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2285013

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

hidl2aidl/main.cpp

diff --git a/hidl2aidl/main.cpp b/hidl2aidl/main.cpp
index 995d337..d9b6e9b 100644
--- a/hidl2aidl/main.cpp
+++ b/hidl2aidl/main.cpp
@@ -232,7 +232,7 @@
     out << "            enabled: true,\n";
     out << "        },\n";
     out << "        java: {\n";
-    out << "            sdk_version: \"module_current\",\n";
+    out << "            sdk_version: \"system_current\",\n";
     out << "        },\n";
     out << "    },\n";
     out << "}\n\n";
@@ -261,7 +261,7 @@
     emitAidlSharedLibs(out, fqName, AidlBackend::JAVA);
     emitHidlSharedLibs(out, targets, AidlBackend::JAVA);
     out << "    ],\n";
-    out << "    sdk_version: \"module_current\",\n";
+    out << "    sdk_version: \"system_current\",\n";
     out << "}\n\n";
 }
 

hidl2aidl/test/Android.bp

diff --git a/hidl2aidl/test/Android.bp b/hidl2aidl/test/Android.bp
index d780c9a..408baef 100644
--- a/hidl2aidl/test/Android.bp
+++ b/hidl2aidl/test/Android.bp
@@ -128,7 +128,7 @@
     srcs: [":hidl2aidl_test_gen_aidl"],
     backend: {
         java: {
-            sdk_version: "module_current",
+            sdk_version: "system_current",
         },
     },
     flags: [