Clean up Mac OS X .jnilibs

Those .jnilibs that are not needed as .dylibs (this includes those that are also
UNO components) are handled via RepositoryFixes.mk.  The remaining one,
libjava_uno.jnilib is packaged as a symlink in instdir.  Everything else is not
necessary and removed (including the venerable oddity macosx-create-bundle).

Change-Id: I34a1801b0733cdff885c1c72db16fa631c5d82ef

3 files changed, 6 insertions, 46 deletions

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 162a5223e635..49069864998f 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -171,7 +171,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
     scp2/source/ooo/module_lang_template \
     scp2/source/ooo/profileitem_ooo \
     scp2/source/ooo/scpaction_ooo \
-    scp2/source/ooo/shortcut_ooo \
     $(if $(filter WNTGCC,$(OS)$(COM)),\
 		scp2/source/ooo/mingw_dlls \
 	) \
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
deleted file mode 100644
index 1515de36fb39..000000000000
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-#ifdef MACOSX
-
-#ifdef ENABLE_JAVA
-
-// auto_ooo_lib_hsqldb defined in gbuild ($(WORKDIR)/AutoInstall/ooo)
-Shortcut gid_Shortcut_Lib_Hsqldb_2
-    FileID = auto_ooo_lib_hsqldb;
-    Dir = SCP2_OOO_LIB_DIR;
-    Name = "libhsqldb.jnilib";
-    Styles = (NETWORK, RELATIVE);
-End
-
-#endif
-
-#endif
-
-//i44154 -end-
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index a1f76461aa03..a1b14c66347e 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -282,12 +282,10 @@ End
 #endif
 
 #if defined ENABLE_JAVA && defined MACOSX
-Unixlink gid_Unixlink_Dl_JavaUno
-    BIN_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = "libjava_uno.jnilib";
-    Target = "libjava_uno.dylib";
-    Styles = ();
+File gid_File_bridges_jnilib_java_uno
+    Dir = FILELIST_DIR;
+    Name = "bridges_jnilib_java_uno.filelist";
+    Styles = (FILELIST);
 End
 #endif
 
@@ -638,6 +636,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Profile_Uno,
             gid_Unixlink_File_Dl_Rmcxt,
             gid_File_Dl_JrepropertiesClass,
+            gid_File_bridges_jnilib_java_uno,
             gid_File_ure_install,
             gid_File_Dl_Jpipe,
             gid_File_Dl_Jpipx,
@@ -657,8 +656,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Misc_TypesRdb,
             gid_File_Misc_ServicesRdb,
             gid_File_Misc_JavavendorsXml);
-    Unixlinks = (gid_Unixlink_Dl_JavaUno,
-                 gid_Unixlink_File_Dl_Sal,
+    Unixlinks = (gid_Unixlink_File_Dl_Sal,
                  gid_Unixlink_File_Dl_Salhelper,
                  gid_Unixlink_File_Dl_Cppu,
                  gid_Unixlink_File_Dl_Cppuhelper,