diff options
| -rw-r--r-- | Repository.mk | 4 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index cf7c0a8ef572..68a8890d06fb 100644 --- a/Repository.mk +++ b/Repository.mk @@ -376,9 +376,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ juh \ juhx \ log_uno \ - reg \ sal_textenc \ - store \ sunjavaplugin \ unsafe_uno \ xmlreader \ @@ -563,7 +561,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ jvmfwk \ + reg \ sal \ + store \ )) $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 77c51be26b39..dfdba60de5e8 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -38,7 +38,9 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) ifneq ($(OS),ANDROID) gb_Library_FILENAMES := $(patsubst unobootstrapprotector:libuno%,unobootstrapprotector:uno%,$(gb_Library_FILENAMES)) |