diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-11-12 21:37:23 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-11-12 21:37:23 +0530 |
| commit | 5e62f3105f5fe86f1fee84c8c89cff03921abf26 (patch) | |
| tree | fdb69830d5eb65b15ea7c54170858334731a2eec | |
| parent | f7b8d4bace4b399a8cbb1aab326182eb5f0b1989 (diff) | |
| parent | 8d0e2ae7747ad7fcbab35a4b9b3a52ad0bf71f45 (diff) | |
Merge remote-tracking branch 'remotes/upstream/master'
| -rw-r--r-- | build-scripts/build-android | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 935beeb..430f3a3 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -211,6 +211,7 @@ if [ ! -n "$SKIP_LICENSE_CHECK" ]; then ${BUILD_SCRIPT_ROOT}/license-verification.sh out/pinned-manifest.xml out/target/product/$TARGET_PRODUCT/BUILD-INFO.txt fi -${BUILD_SCRIPT_ROOT}/../utils/manifest-descriptions/make.sh out/source-manifest.xml out/pinned-manifest.xml - +if [ -n "$PUBLISH_DESCRIPTIONS" ]; then + ${BUILD_SCRIPT_ROOT}/../utils/manifest-descriptions/make.sh out/source-manifest.xml out/pinned-manifest.xml +fi flatten_artifacts |