summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Vartanian <flooey@google.com>2019-04-10 05:19:15 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-10 05:19:15 -0700
commit339e0df32d3843f80eba53cac421a3b23e3c2217 (patch)
treebd5c226553e7fb2061fccb9db4fdbcea285022c4
parent2e5983face85bcb39a206900879e2db530765169 (diff)
parentecf491e593609b87fb512affd4934e4141fd7e78 (diff)
downloadcurrysrc-339e0df32d3843f80eba53cac421a3b23e3c2217.tar.gz
Ignore comments in changelog check am: f42e4e5ffd
am: ecf491e593 Change-Id: Ibb0f224c68633a2407a720e4b7a96b9edbd8a168
-rw-r--r--scripts/repackage-common.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/repackage-common.sh b/scripts/repackage-common.sh
index 5142959..9753f24 100644
--- a/scripts/repackage-common.sh
+++ b/scripts/repackage-common.sh
@@ -204,19 +204,19 @@ function checkChangeLog {
if [[ -f "${DEFAULT_CONSTRUCTORS_FILE}" ]]; then
# Check to ensure that all the requested default constructors were added.
- checkChangeLog <(sort -u "${DEFAULT_CONSTRUCTORS_FILE}") "AddDefaultConstructor" \
+ checkChangeLog <(sort -u "${DEFAULT_CONSTRUCTORS_FILE}" | grep -v '^#') "AddDefaultConstructor" \
"Default constructors were not added at the following locations from ${DEFAULT_CONSTRUCTORS_FILE}:"
fi
if [[ -f "${CORE_PLATFORM_API_FILE}" ]]; then
# Check to ensure that all the requested annotations were added.
- checkChangeLog <(sort -u "${CORE_PLATFORM_API_FILE}") "@libcore.api.CorePlatformApi" \
+ checkChangeLog <(sort -u "${CORE_PLATFORM_API_FILE}" | grep -v '^#') "@libcore.api.CorePlatformApi" \
"CorePlatformApi annotations were not added at the following locations from ${CORE_PLATFORM_API_FILE}:"
fi
if [[ -f "${INTRA_CORE_API_FILE}" ]]; then
# Check to ensure that all the requested annotations were added.
- checkChangeLog <(sort -u "${INTRA_CORE_API_FILE}") "@libcore.api.IntraCoreApi" \
+ checkChangeLog <(sort -u "${INTRA_CORE_API_FILE}" | grep -v '^#') "@libcore.api.IntraCoreApi" \
"IntraCoreApi annotations were not added at the following locations from ${INTRA_CORE_API_FILE}:"
fi