Move java/jni to libs/libvirtualization_jni
java/jni/Android.bp has two modules.
* libvirtualizationservice_jni
* libvirtualmachine_jni
Since we can't name the directory to either of the two libraries, invent
a new "virtual" name libvirtualization_jni
Bug: 352458998
Test: pass TH
Change-Id: I30fcfd9150cdadbfa9db6edcf611b395691572f0
diff --git a/java/jni/Android.bp b/libs/libvirtualization_jni/Android.bp
similarity index 100%
rename from java/jni/Android.bp
rename to libs/libvirtualization_jni/Android.bp
diff --git a/java/jni/android_system_virtualmachine_VirtualMachine.cpp b/libs/libvirtualization_jni/android_system_virtualmachine_VirtualMachine.cpp
similarity index 96%
rename from java/jni/android_system_virtualmachine_VirtualMachine.cpp
rename to libs/libvirtualization_jni/android_system_virtualmachine_VirtualMachine.cpp
index ed102bf..3f1d8a0 100644
--- a/java/jni/android_system_virtualmachine_VirtualMachine.cpp
+++ b/libs/libvirtualization_jni/android_system_virtualmachine_VirtualMachine.cpp
@@ -49,7 +49,7 @@
extern "C" JNIEXPORT jobject JNICALL
Java_android_system_virtualmachine_VirtualMachine_nativeConnectToVsockServer(
- JNIEnv* env, [[maybe_unused]] jclass clazz, jobject vmBinder, jint port) {
+ JNIEnv *env, [[maybe_unused]] jclass clazz, jobject vmBinder, jint port) {
using aidl::android::system::virtualizationservice::IVirtualMachine;
using ndk::ScopedFileDescriptor;
using ndk::SpAIBinder;
@@ -59,8 +59,8 @@
std::tuple args{env, vm.get(), port};
using Args = decltype(args);
- auto requestFunc = [](void* param) {
- auto [env, vm, port] = *static_cast<Args*>(param);
+ auto requestFunc = [](void *param) {
+ auto [env, vm, port] = *static_cast<Args *>(param);
ScopedFileDescriptor fd;
if (auto status = vm->connectVsock(port, &fd); !status.isOk()) {
diff --git a/java/jni/android_system_virtualmachine_VirtualizationService.cpp b/libs/libvirtualization_jni/android_system_virtualmachine_VirtualizationService.cpp
similarity index 100%
rename from java/jni/android_system_virtualmachine_VirtualizationService.cpp
rename to libs/libvirtualization_jni/android_system_virtualmachine_VirtualizationService.cpp
diff --git a/java/jni/common.h b/libs/libvirtualization_jni/common.h
similarity index 100%
rename from java/jni/common.h
rename to libs/libvirtualization_jni/common.h
diff --git a/libs/service-virtualization/src/com/android/system/virtualmachine/SecretkeeperJobService.java b/libs/service-virtualization/src/com/android/system/virtualmachine/SecretkeeperJobService.java
index 473fbfb..4899dcb 100644
--- a/libs/service-virtualization/src/com/android/system/virtualmachine/SecretkeeperJobService.java
+++ b/libs/service-virtualization/src/com/android/system/virtualmachine/SecretkeeperJobService.java
@@ -95,7 +95,7 @@
}
sJob.set(null);
// We don't reschedule on error, we will try again the next day anyway.
- jobFinished(params, /*wantReschedule=*/ false);
+ jobFinished(params, /* wantReschedule= */ false);
}
}.start();