diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-20 03:55:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-20 03:55:01 +0000 |
| commit | 5e7b18939d0c6d4327c4f491f16e06ceef6b212f (patch) | |
| tree | d3be6377fea54edb78df39926dc185d62fa941dd | |
| parent | bf137260a72ce94a3fecba7397a0004cd9706602 (diff) | |
| parent | ce46a74797e624083f788a4e83dd04e6850ea921 (diff) | |
| download | common-5e7b18939d0c6d4327c4f491f16e06ceef6b212f.tar.gz | |
Merge "Android.mk is going to be deprecated under device/google folder" into main am: 4a43047559 am: ce46a74797
Original change: https://android-review.googlesource.com/c/device/common/+/2836175
Change-Id: I4e9f25eda12cc36c806570cf444b8c5e1fb7b57a
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 |