commit faca7f5ace8912f7872393c4cf9981daf5dd75e7
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 11 03:04:33 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 11 03:04:33 2022 +0000
tree c6338f9a442710f2a7e10777f6c3ea89f4add1af
parent 171aa52c4d60f3f2ab75680c5ebc1873cd60950b
parent e172781f69e7a9c32cd62bfa6280fb4fa846aafc

Merge "Change repo hooks after tools/ migrated from libs to systemlibs" into tm-dev

PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 52bb6db..7a9b8ca 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,7 +1,7 @@
 [Hook Scripts]
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
 ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}
-overlayable_resource_hook = ${REPO_ROOT}/packages/apps/Car/libs/tools/rro/verify-overlayable.py -r res -e res/values/overlayable.xml -o res/values/overlayable.xml
+overlayable_resource_hook = ${REPO_ROOT}/packages/apps/Car/systemlibs/tools/rro/verify-overlayable.py -r res -e res/values/overlayable.xml -o res/values/overlayable.xml
 
 [Builtin Hooks]
 commit_msg_changeid_field = true

tools/generate-overlayable.sh

diff --git a/tools/generate-overlayable.sh b/tools/generate-overlayable.sh
index 8c7d859..84aa049 100755
--- a/tools/generate-overlayable.sh
+++ b/tools/generate-overlayable.sh
@@ -21,7 +21,7 @@
 
 PROJECT_TOP=$ANDROID_BUILD_TOP/packages/apps/Car/SettingsIntelligence
 
-python $ANDROID_BUILD_TOP/packages/apps/Car/libs/tools/rro/generate-overlayable.py \
+python $ANDROID_BUILD_TOP/packages/apps/Car/systemlibs/tools/rro/generate-overlayable.py \
     -n CarSettingsIntelligence \
     -r $PROJECT_TOP/res \
     -e $PROJECT_TOP/res/values/overlayable.xml \