aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeng Wang <mewan@google.com>2020-09-14 22:23:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-14 22:23:48 +0000
commit77fa519d2e4b123f779bf87f31ade8549129bcd9 (patch)
treea2a0693fa7cfbabde6d32ebad60df43250c2349e
parentf4e86c9bf48c405c7d65bb3feded864b2d6c45e8 (diff)
parent4524d9f6657358aacdfee1681ba3f7b1e25c8200 (diff)
downloadplatform_tools_carrier_settings-77fa519d2e4b123f779bf87f31ade8549129bcd9.tar.gz
platform_tools_carrier_settings-77fa519d2e4b123f779bf87f31ade8549129bcd9.tar.bz2
platform_tools_carrier_settings-77fa519d2e4b123f779bf87f31ade8549129bcd9.zip
Add comments for customizing version number am: d5df5059aa am: d245ce9d21 am: 74b182621d am: 4524d9f665
Original change: https://android-review.googlesource.com/c/platform/tools/carrier_settings/+/1426253 Change-Id: If78a6f321e0be6908a1e6a2f43d12b0c3b83c723
-rw-r--r--main.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.sh b/main.sh
index ed68108..0ee351c 100644
--- a/main.sh
+++ b/main.sh
@@ -53,10 +53,12 @@ cp $INPUT_APNS_XML_FILE "$TMP_DIR"/apns-full-conf.xml > /dev/null
# 2c. Convert XMLs to TEXTPB
-# DO NOT change the EPOCH date. It's used by CarrierSettings server.
EPOCH=$(date -d '2018-06-01T00:00:00Z' +%s)
NOW=$(date +%s)
TIMESTAMP="$((NOW-EPOCH))"
+# Use TIMESTAMP as version number
+# To customize the version number, assign the customized value to VERSION.
+VERSION="$TIMESTAMP"
SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
UPDATE_APN=$SCRIPT_DIR/bin/update_apn
@@ -71,7 +73,7 @@ out/host/linux-x86/bin/CarrierConfigConverterV2 \
--output_dir="$TMP_DIR"/data \
--vendor_xml="$TMP_DIR"/vendor.xml \
--assets="$ASSETS_DIR"/ \
- --version=$TIMESTAMP > /dev/null
+ --version=$VERSION > /dev/null
"$UPDATE_APN" \
--apn_file="$TMP_DIR"/apns-full-conf.xml \
--data_dir="$TMP_DIR"/data \