summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/core/clear_vars.mk7
-rw-r--r--build/core/maven_artifact_publish.mk15
2 files changed, 14 insertions, 8 deletions
diff --git a/build/core/clear_vars.mk b/build/core/clear_vars.mk
index f996179..74ce25b 100644
--- a/build/core/clear_vars.mk
+++ b/build/core/clear_vars.mk
@@ -8,4 +8,9 @@ LOCAL_MAVEN_ARTIFACT :=
LOCAL_MAVEN_VERSION :=
LOCAL_MAVEN_CLASSIFIER :=
LOCAL_MAVEN_PACKAGING :=
-LOCAL_MAVEN_REPO := \ No newline at end of file
+LOCAL_MAVEN_REPO :=
+LOCAL_MAVEN_POM :=
+LOCAL_MAVEN_TARGET_MODULE :=
+LOCAL_MAVEN_REPO_ID :=
+LOCAL_MAVEN_SOURCES :=
+LOCAL_MAVEN_JAVADOC := \ No newline at end of file
diff --git a/build/core/maven_artifact_publish.mk b/build/core/maven_artifact_publish.mk
index 5746f95..c1fcf50 100644
--- a/build/core/maven_artifact_publish.mk
+++ b/build/core/maven_artifact_publish.mk
@@ -15,21 +15,20 @@
full_target := $(call doc-timestamp-for,$(LOCAL_MODULE))
ifeq ($(strip $(LOCAL_MAVEN_POM)),)
- $(error LOCAL_MAVEN_POM not defined.)
+ $(warning LOCAL_MAVEN_POM not defined.)
endif
ifeq ($(strip $(LOCAL_MAVEN_REPO)),)
- $(error LOCAL_MAVEN_REPO not defined.)
-endif
-ifeq ($(strip $(LOCAL_MAVEN_TARGET_MODULE)),)
- $(error LOCAL_MAVEN_TARGET_MODULE not defined.)
+ $(warning LOCAL_MAVEN_REPO not defined.)
endif
ifeq ($(strip $(LOCAL_MAVEN_REPO_ID)),)
- $(error LOCAL_MAVEN_REPO_ID not defined.)
+ $(warning LOCAL_MAVEN_REPO_ID not defined.)
endif
$(full_target): pomfile := $(LOCAL_MAVEN_POM)
$(full_target): repo := $(LOCAL_MAVEN_REPO)
+ifdef LOCAL_MAVEN_TARGET_MODULE
$(full_target): path_to_file := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MAVEN_TARGET_MODULE),,COMMON)/javalib.jar
+endif
$(full_target): repoId := $(LOCAL_MAVEN_REPO_ID)
$(full_target): classifier := $(LOCAL_MAVEN_CLASSIFIER)
$(full_target): sources := $(LOCAL_MAVEN_SOURCES)
@@ -37,6 +36,7 @@ $(full_target): javadoc := $(LOCAL_MAVEN_JAVADOC)
$(full_target): artifact_path := $(LOCAL_MAVEN_ARTIFACT_PATH)
$(full_target): artifact_path ?= $(basename $(path_to_file))
+ifdef LOCAL_MAVEN_TARGET_MODULE
$(full_target): $(LOCAL_MAVEN_TARGET_MODULE) $(path_to_file) $(artifact_path) $(ACP)
@echo -e ${CL_GRN}"Renaming generated sdk javalib jar"${CL_RST}
$(hide) $(ACP) $(path_to_file) $(artifact_path)
@@ -50,4 +50,5 @@ $(full_target): $(LOCAL_MAVEN_TARGET_MODULE) $(path_to_file) $(artifact_path) $(
-Dsources=$(sources) \
-Djavadoc=$(javadoc)
@echo -e ${CL_GRN}"Publishing:"${CL_RST}" $@"
-$(LOCAL_MODULE): $(full_target) \ No newline at end of file
+endif
+$(LOCAL_MODULE): $(full_target)