diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-21 03:14:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-21 03:14:56 +0000 |
commit | 6f2d20fc13ebdebcd6ae74397df717c32ec34c76 (patch) | |
tree | f60f485b7df75350a1a1b01357b19ce3272166dd | |
parent | 9548337463445c6f75ba5ac0b9b2a3f7cedd2563 (diff) | |
parent | de0d061137d3e081682c48de918412d473c693f0 (diff) | |
download | common-6f2d20fc13ebdebcd6ae74397df717c32ec34c76.tar.gz |
Merge "Android.mk is going to be deprecated under device/google folder" into main am: 4a43047559 am: 8502c68f2b am: de0d061137
Original change: https://android-review.googlesource.com/c/device/common/+/2836175
Change-Id: Id1787225ae7d38f99b8199a0af6f50ec07519085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-x | generate-packages.sh | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ do 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 |