commit a69f5185bdae7404e610b16b4433f06086476132
author Shuo Qian <shuoq@google.com> Mon Oct 14 15:09:03 2019 -0700
committer Shuo Qian <shuoq@google.com> Wed Oct 16 20:24:22 2019 +0000
tree 8daa49885d8a85dea19e3466ffefe0940d0adc62
parent b19d68f23c0788edb20e3b1a6f6b2cbe4776d84a

Fix script to compile emergency number database

Test: Manual
Bug: 136027884
Change-Id: Ie65d20420fdba87bd64efb2cb693ec6819baa6bd
Merged-In: Ie65d20420fdba87bd64efb2cb693ec6819baa6bd
(cherry picked from commit 9838ee813ee16436210902f6ad5bd5347e6bd3a9)

ecc/conversion_toolset_v1/gen_eccdata.sh

diff --git a/ecc/conversion_toolset_v1/gen_eccdata.sh b/ecc/conversion_toolset_v1/gen_eccdata.sh
index 1efac37..803f39b 100644
--- a/ecc/conversion_toolset_v1/gen_eccdata.sh
+++ b/ecc/conversion_toolset_v1/gen_eccdata.sh
@@ -19,7 +19,7 @@
 source "${LOCAL_TOOLSET_DIR}/env.sh"
 
 echo "Converting eccdata..."
-${ANDROID_BUILD_TOP}/prebuilts/tools/linux-x86_64/protoc/bin/protoc \
+${ANDROID_BUILD_TOP}/prebuilts/misc/${KERNEL}-x86/protobuf/aprotoc \
   --encode=ecc.AllInfo proto/protobuf_ecc_data.proto \
   < "${INPUT_DATA}" > "${RAW_DATA}"
 

ecc/gen_eccdata.sh

diff --git a/ecc/gen_eccdata.sh b/ecc/gen_eccdata.sh
index e4dd745..4c1f616 100755
--- a/ecc/gen_eccdata.sh
+++ b/ecc/gen_eccdata.sh
@@ -34,7 +34,7 @@
 esac
 
 read -d "" PROTOC_COMMAND << END || :
-${ANDROID_BUILD_TOP}/prebuilts/tools/${KERNEL}-x86_64/protoc/bin/protoc
+${ANDROID_BUILD_TOP}/prebuilts/misc/${KERNEL}-x86/protobuf/aprotoc
 END
 if ! [ -x "${PROTOC_COMMAND}" ] ; then
   echo "Missing ${PROTOC_COMMAND}." 1>&2