diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 13:09:51 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 13:09:51 +0100 |
| commit | 1bbac0dbd1b4a7e64ecd42443a4e6e9b13af1fb9 (patch) | |
| tree | 07790f46da5b1716448b576ce2b6d81e7a0ddca4 /build/core | |
| parent | 076588cc654f9dbbc6e65a291dd85e8e8c096d1e (diff) | |
| parent | dee68b3f6e1d78bb8dca56ef3ce64045edce4bfd (diff) | |
| download | vendor_replicant-1bbac0dbd1b4a7e64ecd42443a4e6e9b13af1fb9.zip vendor_replicant-1bbac0dbd1b4a7e64ecd42443a4e6e9b13af1fb9.tar.gz vendor_replicant-1bbac0dbd1b4a7e64ecd42443a4e6e9b13af1fb9.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_vendor_cm into replicant-6.0
Diffstat (limited to 'build/core')
| -rw-r--r-- | build/core/apicheck_msg_current.txt | 8 | ||||
| -rw-r--r-- | build/core/maven_artifact_publish.mk | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/build/core/apicheck_msg_current.txt b/build/core/apicheck_msg_current.txt index f58858e..05a0341 100644 --- a/build/core/apicheck_msg_current.txt +++ b/build/core/apicheck_msg_current.txt @@ -2,11 +2,15 @@ ****************************** You have tried to change the API from what has been previously approved. +STOP. + Read this: + https://github.com/CyanogenMod/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api + To make these errors go away, you have two choices: 1) You can add "@hide" javadoc comments to the methods, etc. listed in the errors above. - 2) You can update current.txt by executing the following command: + 2) You can update current.txt (locally) by executing the following command: make update-cm-api ^^^^^^^^^^^^^^^^^^ @@ -140,4 +144,4 @@ To make these errors go away, you have two choices: To submit the revised current.txt to the main CyanogenMod repository, you will need approval. -******************************
\ No newline at end of file +****************************** diff --git a/build/core/maven_artifact_publish.mk b/build/core/maven_artifact_publish.mk index c1fcf50..f72e970 100644 --- a/build/core/maven_artifact_publish.mk +++ b/build/core/maven_artifact_publish.mk @@ -27,7 +27,7 @@ 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 +$(full_target): path_to_file := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MAVEN_TARGET_MODULE),,COMMON)/javalib.aar endif $(full_target): repoId := $(LOCAL_MAVEN_REPO_ID) $(full_target): classifier := $(LOCAL_MAVEN_CLASSIFIER) @@ -38,7 +38,7 @@ $(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} + @echo -e ${CL_GRN}"Renaming generated sdk javalib aar"${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 \ |