diff options
| author | Xin Li <delphij@google.com> | 2020-01-15 15:56:30 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-01-15 15:56:30 -0800 |
| commit | bfe02857255a8f732075b897e293717692b9cac3 (patch) | |
| tree | f78aab6210674097a5632908b5b512139efd5c66 | |
| parent | 587fc20905e241750152831bc27ffe99b576a535 (diff) | |
| parent | d4ad362be69b1c5084215054bd4b06cd39ce2183 (diff) | |
| download | device_common-android10-sidebranch.tar.gz device_common-android10-sidebranch.tar.bz2 device_common-android10-sidebranch.zip | |
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-masterandroid10-sidebranch
Bug: 146167222
Change-Id: I90fe9945822d5169ff12e9b5f3a49373c0162d7a
| -rwxr-xr-x | generate-packages.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/generate-packages.sh b/generate-packages.sh index 7b158c3..7a853ad 100755 --- a/generate-packages.sh +++ b/generate-packages.sh @@ -155,12 +155,9 @@ do mv ${FILEDIR_ROOT}/proprietary/device-vendor.mk ${FILEDIR_ROOT_SHARE} fi - if [[ ${COMPANY} == qcom ]] + if [[ -e "${MAKEFILEDIR}/Android.mk" ]] then - if [[ -e "${MAKEFILEDIR}/Android.mk" ]] - then - mv ${MAKEFILEDIR}/Android.mk ${FILEDIR}/ - fi + mv ${MAKEFILEDIR}/Android.mk ${FILEDIR}/ fi echo \ \ Generating self-extracting script |