summaryrefslogtreecommitdiff
path: root/bin/update_pch
AgeCommit message (Collapse)Author
2024-04-18move writerfilter inside swNoel Grandin
writerfilter wants to convert incoming RTF and OOXML files into writer's document model. But it currently has to do so by manipulating the limited subset that we expose through the UNO API. This is both slower and less accurate than having access to the full document model. So move it inside, and then we can strip out various hacks, and optimise imports. Change-Id: Ie1114d28130ef5f9a786531bc552cb8ee7768015 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165953 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-03-28Drop transitional header xmlsecurity/xmlsec-wrapper.hGabor Kelemen
It was introduced with commit ec52e5e5a204862905b555cdc1f7393aede1f7d8 and the reason of that was the XMLSEC_NO_SIZE_T behavior consolidation. But this was removed later with commit bfd479abf0d1d8ce36c3b0dcc6c824216f88a95b Change-Id: Ib5350d9ab5554d1412821b762cd3ee7906b65b64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165440 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
2024-02-15Revert "merge sdui library into sd"Noel Grandin
This reverts commit 2cf7c26293462406d91ee050c6677930065e660b. Reason for revert: <_rene_> noelgrandin: sdui->sd... and what about people not needing that ui? <_rene_> (e.g. --disable-gui and libreoffice-draw-nogui and impress-nogui) <_rene_> i.e. the use case of --convert-to for ppt(x) etc Change-Id: I6755c209e63f34b3fc9f9fdc4af7001b18579e8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163348 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2024-02-14merge sdui library into sdNoel Grandin
which eliminates another dynamic-symbol lookup and another complication which was making it harder to do better with --enable-mergedlibs sd is relatively small, so even the combined library is not as big as one of the sw and sc libraries Change-Id: Ibef8077d70a5abc7361c95f5dbb8c43447610188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163302 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-07-10update skia to m116Noel Grandin
(from m111) SK_SUPPORT_GPU is now SK_GANESH GR_OP_ALLOCATE_USE_NEW was removed in skia m111 commit dd8f8ed3848cbe2032edc7ec08ef648a23e28ad9 Author: Mike Klein <mtklein@google.com> Date: Thu Apr 22 12:17:33 2021 -0500 clean up defines that do nothing the fast-png-write patch was removed. The underlying helper function we need was removed in commit 0ec4c84abd0b578a5c792b04b56653cbc325530e Author: Kevin Lubick <kjlubick@google.com> Date: Thu Apr 20 14:46:28 2023 -0400 Remove SkImageEncoder and SkImage::encodeToData So I updated our dump() function in SkiaHelper.cxx to use the new Skia API. The constexpr-template patch seems to be superceded by skia changes. SkOpts: :hash_fn has been replaced with SkChecksum::Hash32 commit 657ed9cf2379a950b925cb2aba7c85d6e1dd36ed Author: Brian Osman <brianosman@google.com> Date: Tue May 23 12:40:12 2023 +0000 Reland "Replace SkOpts::hash/hash_fn with SkChecksum::Hash32" The SkDebugf function needs to be exported from the library since it leaks out to calling code via some of the headers. Change-Id: I80ace8f25e660fa7889d22ef90676f47264d866c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154223 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12introduce docmodel comp., model::ThemeColor, use it in SvxColorItemTomaž Vajngerl
Added a new component docmodel, that has the document model types, which only depend on other basic components. This is needed so the types can be used in every relevant component - xmloff, oox, svx, editeng,... Introduces model::ThemeColor, which is a class used to store the theme color data, including transformations (svx::Transformation). For UNO use XThemeColor is added, and the implementation UnoThemeColor which wraps svx::ThemeColor, so it can be tranported around. Reactor all the code and tests to accomodate for this change. Change-Id: I7ce6752cdfaf5e4d3b8e4d90314afa469dd65cfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144847 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-11-26-FIIntrin.h in CC/CXX is no longer needed for my clang-cl buildStephan Bergmann
...at least with Clang 14 trunk now (but I didn't check which llvm commit would be responsible for that, and which version of LLVM that appeared in first). That also means the -D_CRT_RAND_S hack in CXX is no longer needed either. (See the mail thread starting at <https://lists.llvm.org/pipermail/cfe-dev/2015-November/046012.html> "[cfe-dev] clang-cl question".) Change-Id: If1b1b4fa17782161c3b72ac68fdef28b0e044a31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125859 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-11-03PCH for external/zxingLuboš Luňák
Change-Id: Ia4bfa53ff56f64c7ba8fa068bbbe9dff2c4a84fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124652 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-09Typo: braket->bracketJulien Nabet
Change-Id: I75c8c0fc15acb7e3ae6e59de91d5d9f67a4cd1ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123317 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-09-11don't include Vulkan headers for Skia PCHLuboš Luňák
It's not built on Mac. Change-Id: Ica6aed9da51bb5cfd6dd1255e1231d5f0e53ba2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121926 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-08-26update Skia to chrome/m94Luboš Luňák
Updating to m91 or newer required handling the problem with Vulkan crashing, but that's been finally fixed by the previous commit. This Skia version also requires at least freetype-2.8.1, so disable Skia if that's not available (LO's minimum is lower). Additionally patch out Skia's use of TT_SUPPORT_COLRV1, which seems to be an unstable freetype API from the git version and it doesn't even compile with the latest stable 2.9.11 release Change-Id: I4a17effb912468c43fc7cdb69fe453062e4d2447 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120967 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-04-14Revert "update Skia to chrome/m91" (tdf#141680)Luboš Luňák
The m91 snapshot seems to cause a number of Vulkan problems. My commit already worked around one, but there are apparently others, such as very slow startup, or a failed Skia assertion triggered by VCL Skia's copyArea(). This reverts commit 09d850e46903a528d4b08d3fdf03c3964d79fbc5. Change-Id: I4f1832ba76db15cab8eccbe115d21c989da3c841 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114089 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-04-12update Skia to chrome/m91Luboš Luňák
Change-Id: I82050e9695b9aa49c33ee16d345bb64595b00bbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113978 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-04-08allow more trivial #if's for including headers in PCHsLuboš Luňák
Change-Id: I734ac1832bafe0f4e5710b9b27bd03833179e2d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113800 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-04-08make update_pch.sh aware of '#pragma once'Luboš Luňák
Headers are allowed to have one #if block that is not ignored, on the assumption that it is the include guard. This shouldn't be the case if the header uses #pragma once, obviously. Change-Id: Ib0aa0933ce224ca4e3ecf209593852da0f4ca5ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113799 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-04-08make update_pch.sh abort on an errorLuboš Luňák
The script depends also on generated sources in workdir, which it may fail to find if they haven't been built before running the script. Prefer to fail on errors rather than ignoring them. Note that when using builddir != srcdir, the script requires $WORKDIR to be set (done e.g. by the recommended 'make cmd cmd="./bin/update_pch.sh [..]"'). Change-Id: I93429c133bd0876730a850d944707880848201f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113798 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-03-09Make sal/config.h the first in pchMike Kaganski
By convention, it should be the first include in C/CXX files; so use of pch should not break that. Change-Id: Ic329c5f39e8f48ad1778724368e262e48972342b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112123 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-03-03update Skia to chrome/m90Luboš Luňák
Including chrome/m89, which wasn't included before because of tdf#140023. Change-Id: I64f1de8e10eab2d92a9383ce8104be5afca40101 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111792 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-08-26Remove outdated comment lineAndrea Gelmini
Please see Julien comment here: https://gerrit.libreoffice.org/c/core/+/100871 Change-Id: I8188d2b26cab24f39630151d256104f633252b98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100920 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins
2020-07-22weld PatternControlCaolán McNamara
Change-Id: Ie84778c2f127a6b393edbfa08e61b135ec3bcbc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99174 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-07-13Don't rely on Python's treatment of unrecognized escape sequencesMike Kaganski
According to [1]: > Changed in version 3.6: Unrecognized escape sequences produce a DeprecationWarning. > In a future Python version they will be a SyntaxWarning and eventually a SyntaxError. [1] https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals Change-Id: Ia4f79f17ccb121f423f35b1e1306d5ae285e8762 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98321 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-07-04reduce number of framework librariesNoel Grandin
Change-Id: I18bfdba3d26593f796d8b0bda87720e31066d5e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97968 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-07-04reduce number of framework librariesNoel Grandin
Change-Id: If2bf85301eb1523a636d031f6e5a9f78cb1ee06b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97871 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-07-01update Skia to chrome/m85 snapshotLuboš Luňák
Change-Id: I3af3517c9c213e0db8365aecd0a008d817ca4dcf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97592 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-07Remove erroneous whitespace in update_pchMuhammet Kara
This was causing generation of code in violation of clang-format conformance in these files: * xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx * connectivity/inc/pch/precompiled_ado.hxx Also remove these 2 files from the clang-format blacklist. Change-Id: I882028c0553a3ff7fb356611f498d50dea984a7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88143 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2020-02-01make update_pch also consider files in <module>/src/**/incLuboš Luňák
With --enable-pch=full there's not much difference between a "public" header in <module>/inc and a private one in <module>/src/somewhere/inc . And since the script searches recursively, this apparently helps to find even more headers for lower pch levels. Change-Id: I8483d0aa5b4fea5a59107c20a8aa5f1ef694af0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87799 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-12-01make update_pch work againCaolán McNamara
Change-Id: I8ab1bd9068027b907da7b95a16c6c72d019a9e69 Reviewed-on: https://gerrit.libreoffice.org/84163 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-27update PCH for SkiaLuboš Luňák
Change-Id: Iece4d90774890576bd3d84ed2218de56def96077
2019-11-27add PCH to SkiaLuboš Luňák
Change-Id: I0aa96bec7319010ff4749e3ab5c0ceef3dc55766
2019-11-11make bin/update_pch work with srcdir != builddirLuboš Luňák
I guess I'm tired of symlinking builddir/workdir to srcdir. Change-Id: I6192bb981d6727479cd2ce4b3ac75bb0a71c3fe9 Reviewed-on: https://gerrit.libreoffice.org/82397 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-18make bin/update_pch.s always include code in trivial #if'sLuboš Luňák
E.g. #ifdef LIBO_INTERNAL_ONLY is always true for code that builds with our PCHs. Change-Id: I3cf311ea3621b909105754cfea2cb0116b8b67f5 Reviewed-on: https://gerrit.libreoffice.org/80961 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-14add PCHs for more external libsLuboš Luňák
I think this is all external libs where it makes sense for them to have their own PCH and be worth it. Maybe some smaller externals can also use the common system PCH, but unfortunately many externals use all kinds of defines that affect system headers, which is a problem for the common system PCH. Change-Id: I2c589ac55d93728daf3b158df110722e5f055d45 Reviewed-on: https://gerrit.libreoffice.org/80728 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-08-31[API CHANGE] remove MacroMigrationWizardCaolán McNamara
https://wiki.openoffice.org/wiki/Macros_in_Database_Documents Prior to OpenOffice 3 (2008) base didn't support macros, but subdocuments might have had macros. since OOo3 base supported macros and subdocuments not, and a migration wizard is available to update pre OOo3 documents to the new scheme. Here I presume whatever is going to get migrated has been migrated at this point and drop the migration wizard This undoes the addition of the idl for sdb::application::MacroMigrationWizard of commit 5b982b69363f0f067fe4a0f679528ce1c5a2eafc Date: Mon Mar 11 17:51:56 2013 +0200 so flag as an api change, though not to anything published Change-Id: I37271752234dda4e7e8f033e0136825fd356439b Reviewed-on: https://gerrit.libreoffice.org/78326 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-05-19support also StaticLibrary in update_pchLuboš Luňák
Change-Id: I02127cd8a023e87482eff4071eb81b30f39870fd Reviewed-on: https://gerrit.libreoffice.org/72526 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-05-19port update_pch to python3Luboš Luňák
Change-Id: Ib0676472e5fe2b2f789dba62e9e1d985adb3ed23 Reviewed-on: https://gerrit.libreoffice.org/72525 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-05-19add PCH for pdfiumLuboš Luňák
It's an external library, but it's a large C++ lib and it's built using gbuild, so this helps too. Here with Clang it cuts build time from ~2:40 to ~1:25 (and about halves the CPU user time). Hopefully it also helps to reduce the build time for Windows gerrit builds. Change-Id: Ieef0ea28e0fe1fd216592fca70410075d95ddc54 Reviewed-on: https://gerrit.libreoffice.org/72517 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-05-19make update_pch also work with libs in external/Luboš Luňák
Change-Id: I65b3461fd227e7e997b82a84631bbd5d00b28eb6 Reviewed-on: https://gerrit.libreoffice.org/72520 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-05-12with pch level 2 (base), a module still shouldn't pch its own headersLuboš Luňák
Change-Id: I9c7f7d2f266950fac683bf5148dec741d7652585 Reviewed-on: https://gerrit.libreoffice.org/72194 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-05-12check module include prefix correctly in update_pchLuboš Luňák
Change-Id: I3417f80621584553041eeb504d35cb4241a19b61 Reviewed-on: https://gerrit.libreoffice.org/72203 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-05-09support different levels of PCH usageLuboš Luňák
There are now 4 levels of PCH support, the previous 'full' level adding to PCH whatever the update_pch script finds useful, and new levels 'system', which adds only external headers, 'base', which is 'system' and LO basic headers (sal, osl, rtl, vcl) and 'normal', which is 'full' without headers from the module built itself. With Clang/GCC even 'system' still saves some time (10-15%) and since external headers should rarely if even change, it should be without most of the disadvantages of PCH. And even 'base' should be pretty easy to use, as those headers should be rarely changed while developing, thus avoiding the need for massive rebuilds. Using 'normal' or 'full' does not seem to be worth it with Clang or GCC, but with MSVC that still makes a difference, so keep(?) 'full' the default there. The update_pch script unfortunately does not include as many system headers as it could, since it includes only what is directly included by the .cxx, but not what's included indirectly by .hxx files. https://lists.freedesktop.org/archives/libreoffice/2019-May/082685.html Change-Id: If83a07a1fc9b77d0134502b0d89348944f82806b Reviewed-on: https://gerrit.libreoffice.org/71580 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-05-09better is_c_runtime() detection in update_pchLuboš Luňák
config_xxx.h headers are not system headers, and some module headers as such helpids.h or scdllapi.h are neither. Change-Id: I7ae1a3f1ada43de88eefe34c60e19f7ac703769d Reviewed-on: https://gerrit.libreoffice.org/71579 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2018-11-01gbuild: rename value OS=IOS to OS=iOSMichael Stahl
This gets rid of the horrible hack in gbuild.mk to accomodate the case-incorrect iOS platform makefiles that cannot be renamed without upsetting git on file systems that sadly lack the case sensitivity feature. Keep the macro defined to IOS though. Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234 Reviewed-on: https://gerrit.libreoffice.org/62705 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2018-07-17remove the GL based 3D chartsMarkus Mohrhard
Change-Id: Ia578c71ae70aa0a85b49fa50138edf90f961b1e9 Reviewed-on: https://gerrit.libreoffice.org/57533 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-02-08xmlsecurity: fold Library_xsec_fw into Library_xmlsecurityMiklos Vajna
That little amount of code hardly justifies a separate library. Change-Id: Idbb039f38258bc12759fcf6d29328e1afe7443ab Reviewed-on: https://gerrit.libreoffice.org/49391 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2018-01-05remove dead eeitemid.hxxNoel Grandin
and inline the couple of constants still in use from it Change-Id: Icb9f5690b5649140bc0503a8917e6a0f764e3d9c Reviewed-on: https://gerrit.libreoffice.org/47404 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-09-22Windows: avoid dependence on UNICODE define; prefer W functionsMike Kaganski
Change-Id: I95b90128e93f0d88ed73601bcc5a7ca9279d4cf1 Reviewed-on: https://gerrit.libreoffice.org/42560 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-09-22Put definition of _CRT_RAND_S into bin/update_pchMike Kaganski
so it doesn't get removed again from sal/inc/pch/precompiled_sal.hxx (see commit 4af9612f2be9e023e762831207cbdb1d5f25906f). Also make necessary changes to some of the files that start to fail building after running bin/update_pch.sh, so that the patch is self-contained and leaves the tree in fully functional state. tools namespace had to be prepended with :: to disambiguate from drawinglayer::tools vcl/inc/window.h includes were amended, because ExtTextInputAttr is from vcl/commandevent.hxx, and enum class ShowTrackFlags is from vcl/window.hxx Change-Id: I47179622350754cba2f95d26a1bafd3dfbbc935b Reviewed-on: https://gerrit.libreoffice.org/42559 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-07-15emfplus: create a wmf/emf/emf+ primitive based importerArmin Le Grand
First steps to organize an importer that can read/interpret wmf/emf/emf+ and deliver a primitive representation for the content by parsing it. Use the same mechanisms as already applied for Svg, so to reuse abilities to keep original binary data to allow save again and embedding in files and have an implemented replacement bitmap based representation. For this, unify the used helper classes to handle more than just Svg. For 1st try, add test code and static bool switches Change-Id: I6e0a82943541d811a8f8d65a84115569fcd8cee7
2017-03-04gpg4libre: List and view GPG keysSamuel Mehrbrodt
* Add GPG implementation of css::xml::crypto UNO interfaces (part of that is only stub atm) * List gpg keys along with other certificates * Viewing gpg certificates: Not all properties are implemented yet Change-Id: I7f60b26efe949a94bf8fe1b8d4d428002c2995b1 Reviewed-on: https://gerrit.libreoffice.org/33843 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-01-18there's no need for this nutso redefineCaolán McNamara
both BMP_PLUGIN resources point to the same plugin.png ultimately Change-Id: Ifa1cc00698f749ba84f17a79074c73e080e1d356