cm: Fixup maven artifact publish inclusions.
Change-Id: I81c140ab33460f8ef19c9c34c36f1417a1cd9c71
TICKET: CYNGNOS-1529
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_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 f984473..a278edf 100644
--- a/build/core/maven_artifact_publish.mk
+++ b/build/core/maven_artifact_publish.mk
@@ -15,28 +15,31 @@
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_FILE_PATH)),)
- $(error LOCAL_MAVEN_FILE_PATH 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)
-$(full_target): path_to_file := $(LOCAL_MAVEN_FILE_PATH)
+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)
$(full_target): javadoc := $(LOCAL_MAVEN_JAVADOC)
-$(full_target):
+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)
+ @echo -e ${CL_GRN}"Publishing to Maven"${CL_RST}
$(hide) mvn -e -X gpg:sign-and-deploy-file \
-DpomFile=$(pomfile) \
-Durl=$(repo) \
@@ -46,4 +49,5 @@
-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)