Linux: Update build and run requirements

Author: magreenblatt

native/CMakeLists.txt

@@ -216,9 +216,6 @@ SET_CEF_TARGET_OUT_DIR()
 #
 
 if(OS_LINUX)
-  # Find required libraries and update compiler/linker variables.
-  FIND_LINUX_LIBRARIES("gmodule-2.0 gtk+-2.0 gthread-2.0")
-
   # Helper executable target.
   add_executable(${JCEF_HELPER_TARGET} ${JCEF_HELPER_SRCS})
   SET_EXECUTABLE_TARGET_PROPERTIES(${JCEF_HELPER_TARGET})
@@ -263,10 +260,9 @@ if(OS_LINUX)
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E echo ""
     COMMAND ${CMAKE_COMMAND} -E echo "*** Run the following commands manually to create necessary symlinks ***"
-    COMMAND ${CMAKE_COMMAND} -E echo "sudo ln -s ${CEF_RESOURCE_DIR}/icudtl.dat ${JAVA_DIR}/jre/bin/icudtl.dat"
-    COMMAND ${CMAKE_COMMAND} -E echo "sudo ln -s ${CEF_BINARY_DIR}/natives_blob.bin ${JAVA_DIR}/jre/bin/natives_blob.bin"
-    COMMAND ${CMAKE_COMMAND} -E echo "sudo ln -s ${CEF_BINARY_DIR}/snapshot_blob.bin ${JAVA_DIR}/jre/bin/snapshot_blob.bin"
-    COMMAND ${CMAKE_COMMAND} -E echo "sudo ln -s ${CEF_BINARY_DIR}/v8_context_snapshot.bin ${JAVA_DIR}/jre/bin/v8_context_snapshot.bin"
+    COMMAND ${CMAKE_COMMAND} -E echo "sudo ln -s ${CEF_RESOURCE_DIR}/icudtl.dat ${JAVA_DIR}/bin/icudtl.dat"
+    COMMAND ${CMAKE_COMMAND} -E echo "sudo ln -s ${CEF_BINARY_DIR}/snapshot_blob.bin ${JAVA_DIR}/bin/snapshot_blob.bin"
+    COMMAND ${CMAKE_COMMAND} -E echo "sudo ln -s ${CEF_BINARY_DIR}/v8_context_snapshot.bin ${JAVA_DIR}/bin/v8_context_snapshot.bin"
     COMMAND ${CMAKE_COMMAND} -E echo ""
     VERBATIM
     )

tools/distrib/linux32/run.sh

@@ -13,6 +13,16 @@ else
   EXAMPLE="$1"
 fi
 
+# Necessary for libjcef.so to find libjawt.so.
+JAVA_PATH="$(readlink -f $(which java))"
+JAVA_LIB_PATH="$(dirname ${JAVA_PATH})/../lib"
+if [ ! -d "$JAVA_LIB_PATH" ]; then
+  echo "ERROR: Java lib path does not exist"
+  exit 1
+fi
+
+LIB_PATH="${LIB_PATH}:${JAVA_LIB_PATH}"
+
 # Necessary for jcef_helper to find libcef.so.
 if [ -n "$LD_LIBRARY_PATH" ]; then
   LD_LIBRARY_PATH="$LIB_PATH:${LD_LIBRARY_PATH}"

tools/distrib/linux64/run.sh

@@ -13,6 +13,16 @@ else
   EXAMPLE="$1"
 fi
 
+# Necessary for libjcef.so to find libjawt.so.
+JAVA_PATH="$(readlink -f $(which java))"
+JAVA_LIB_PATH="$(dirname ${JAVA_PATH})/../lib"
+if [ ! -d "$JAVA_LIB_PATH" ]; then
+  echo "ERROR: Java lib path does not exist"
+  exit 1
+fi
+
+LIB_PATH="${LIB_PATH}:${JAVA_LIB_PATH}"
+
 # Necessary for jcef_helper to find libcef.so.
 if [ -n "$LD_LIBRARY_PATH" ]; then
   LD_LIBRARY_PATH="$LIB_PATH:${LD_LIBRARY_PATH}"

tools/run.sh

@@ -20,6 +20,16 @@ else
       exit 1
     fi
 
+    # Necessary for libjcef.so to find libjawt.so.
+    JAVA_PATH="$(readlink -f $(which java))"
+    JAVA_LIB_PATH="$(dirname ${JAVA_PATH})/../lib"
+    if [ ! -d "$JAVA_LIB_PATH" ]; then
+      echo "ERROR: Java lib path does not exist"
+      exit 1
+    fi
+
+    LIB_PATH="${LIB_PATH}:${JAVA_LIB_PATH}"
+
     CLS_PATH="${DIR}/third_party/jogamp/jar/*:$OUT_PATH"
     RUN_TYPE="$3"