commit de0d061137d3e081682c48de918412d473c693f0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 21 02:43:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 21 02:43:50 2023 +0000
tree d3be6377fea54edb78df39926dc185d62fa941dd
parent bf137260a72ce94a3fecba7397a0004cd9706602
parent 8502c68f2b3cab46d6b0876966cad291bf2ca476

Merge "Android.mk is going to be deprecated under device/google folder" into main am: 4a43047559 am: 8502c68f2b

Original change: https://android-review.googlesource.com/c/device/common/+/2836175

Change-Id: I5e8343df3c0f972732cefa87e59de271459ecb36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

generate-packages.sh

diff --git a/generate-packages.sh b/generate-packages.sh
index 2ec4e22..330c5c1 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -161,6 +161,11 @@
     mv ${MAKEFILEDIR}/Android.mk ${FILEDIR}/
   fi
 
+  if [[ -e "${MAKEFILEDIR}/Android.mk.template" ]]
+  then
+    mv ${MAKEFILEDIR}/Android.mk.template ${FILEDIR}/Android.mk
+  fi
+
   if [[ -e "${MAKEFILEDIR}/Android.bp.txt" ]]; then
     mv "${MAKEFILEDIR}/Android.bp.txt" "${FILEDIR}/Android.bp"
   fi