Merge "Change repo hooks after tools/ migrated from libs to systemlibs" into tm-dev am: faca7f5ace
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/SettingsIntelligence/+/17159698
Change-Id: I95b8aede64855c15c8b0e3cf966650ff5adc7a8d
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
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 \