summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-02 09:04:37 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-02 09:06:49 +0100
commit20528637ef3f9517cf73f71fdcf701e945642989 (patch)
tree3f38ab726056ad06b35a716d8aa2c2ae2f7bc43e
parent79b26e3a113f86237dc787bdb5edb238d8a1ad70 (diff)
Add gbuild support for .jar in .oxt.
-rw-r--r--solenv/gbuild/Jar.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 9d410badf347..54d6a238e30b 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -166,9 +166,10 @@ endef
gb_Jar_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/classes/ \
URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
+ OXT:./ \
INTERN:vnd.sun.star.expand:\dOOO_INBUILD_JAVA_DIR/
-# get component prefix from layer name ("OOO", "URE", "INTERN")
+# get component prefix from layer name ("OOO", "URE", "OXT", "INTERN")
gb_Jar__get_componentprefix = \
$(patsubst $(1):%,%,$(or \
$(filter $(1):%,$(gb_Jar_COMPONENTPREFIXES)), \