feat: use packaged symbols directly when JDWP_FAT_BUILD is ON

Allows us to ship a single libjdwp_fat.so file that does not depend on any other shared libraries

Signed-off-by: Akash Yadav <contact@itsaky.com>

Author: itsaky

src/share/back/debugInit.c

@@ -47,6 +47,11 @@
 // ANDROID-CHANGED: Need to sent metrics before debugInit_exit
 #include "timing.h"
 
+// COTG-CHANGED: Fat build support
+#ifdef JDWP_FAT_BUILD
+#include "npt.h"
+#endif
+
 /* How the options get to OnLoad: */
 #define XDEBUG "-Xdebug"
 #define XRUN "-Xrunjdwp"
@@ -343,7 +348,11 @@ Agent_OnLoad(JavaVM *vm, char *options, void *reserved)
     // ANDROID-CHANGED: Load libnpt.so with no path to use the system linker config to find it.
     dbgsysBuildLibName(npt_lib, sizeof(npt_lib), "", NPT_LIBNAME);
     /* Npt and Utf function init */
+#ifdef JDWP_FAT_BUILD
+    nptInitialize(&(gdata->npt), NPT_VERSION, NULL);
+#else
     NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL);
+#endif
     if (gdata->npt == NULL) {
         ERROR_MESSAGE(("JDWP: unable to initialize NPT library"));
         return JNI_ERR;

src/share/back/transport.c

@@ -28,6 +28,10 @@
 #include "debugLoop.h"
 #include "sys.h"
 
+#ifdef JDWP_FAT_BUILD
+#include "dt_socket_extern.h"
+#endif
+
 static jdwpTransportEnv *transport;
 static jrawMonitorID listenerLock;
 static jrawMonitorID sendLock;
@@ -135,15 +139,25 @@ loadTransport(const char *name, jdwpTransportEnv **transportPtr)
 {
     JNIEnv                 *env;
     jdwpTransport_OnLoad_t  onLoad;
-    void                   *handle;
-    const char             *libdir;
 
     /* Make sure library name is not empty */
     if (name == NULL) {
         ERROR_MESSAGE(("library name is empty"));
         return JDWP_ERROR(TRANSPORT_LOAD);
     }
 
+#ifdef JDWP_FAT_BUILD
+    if (strcmp(name, "dt_socket") == 0) {
+        onLoad = &socketTransport_OnLoad;
+    } else {
+        ERROR_MESSAGE(("unknown transport library: %s", name));
+        return JDWP_ERROR(TRANSPORT_LOAD);
+    }
+#else
+
+    void                   *handle;
+    const char             *libdir;
+
     /* First, look in sun.boot.library.path. This should find the standard
      *  dt_socket and dt_shmem transport libraries, or any library
      *  that was delivered with the J2SE.
@@ -186,6 +200,8 @@ loadTransport(const char *name, jdwpTransportEnv **transportPtr)
         return JDWP_ERROR(TRANSPORT_LOAD);
     }
 
+#endif // JDWP_FAT_BUILD
+
     /* Get transport interface */
     env = getEnv();
     if ( env != NULL ) {

src/share/npt/npt.h

@@ -38,7 +38,7 @@
 #include "npt_md.h"
 #include "utf.h"
 
-#define NPT_ERROR(s) { (void)__android_log_print(ANDROID_LOG_ERROR, "LocalJDWP-NPT", "NPT ERROR: %s\n", s); exit(1); }
+#define NPT_ERROR(s) { (void)__android_log_print(ANDROID_LOG_ERROR, "COTG-JDWP-NPT", "NPT ERROR: %s\n", s); exit(1); }
 
 #ifdef __cplusplus
 extern "C" {

src/share/transport/socket/dt_socket_extern.h

@@ -0,0 +1,10 @@
+#ifndef __DT_SOCKET_HEADER
+#define __DT_SOCKET_HEADER
+
+#include "jni.h"
+#include "jdwpTransport.h"
+
+extern jint socketTransport_OnLoad(JavaVM *, jdwpTransportCallback *,
+                                   jint, jdwpTransportEnv **);
+
+#endif

src/share/transport/socket/socketTransport.c

@@ -30,6 +30,7 @@
 
 #include <android/log.h>
 
+#include "dt_socket_extern.h"
 #include "jdwpTransport.h"
 #include "sysSocket.h"
 
@@ -757,3 +758,9 @@ jdwpTransport_OnLoad(JavaVM *vm, jdwpTransportCallback* cbTablePtr,
     tlsIndex = dbgsysTlsAlloc();
     return JNI_OK;
 }
+
+JNIEXPORT jint JNICALL
+socketTransport_OnLoad(JavaVM *vm, jdwpTransportCallback* cbTablePtr,
+                         jint version, jdwpTransportEnv** result) {
+                            return jdwpTransport_OnLoad(vm, cbTablePtr, version, result);
+                         }