summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-04 18:28:46 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-04 21:16:16 +0100
commit4f346c9c1610a1c4b7ecc11ff3b99980763635a0 (patch)
tree09deeb53d4d30e687d0895d018a149a2d8222dc7 /solenv
parent9870a5f73dcfa6c2c15bc1fc6ba70fa3539f33ac (diff)
gbuild: component files for Jars in NONE layer and move testComponent
... from URE to NONE. Change-Id: If43e07b88f2ab0e845f77d1f1a835627e5c48dd7
Diffstat (limited to 'solenv')
-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 1253c2234ce9..56a4ef842b10 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -255,8 +255,9 @@ gb_Jar_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
OXT:./ \
+ NONE:$(call gb_Helper_make_url,$(WORKDIR)/Jar) \
-# get component prefix from layer name ("OOO", "URE", "OXT", "INTERN")
+# get component prefix from layer name ("OOO", "URE", "OXT", "NONE")
gb_Jar__get_componentprefix = \
$(patsubst $(1):%,%,$(or \
$(filter $(1):%,$(gb_Jar_COMPONENTPREFIXES)), \