commit 85e2ef0cbabda314b863c12ee7a22160e9ed60d9
author android-build-team Robot <android-build-team-robot@google.com> Wed Dec 04 02:09:59 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Dec 04 02:09:59 2019 +0000
tree 0e90574064878f9b89fc9f9c01de3b033c55c153
parent 86679dc4aa80cedcbda853103637d92240cd9310
parent a766aad7998794ac62991fcd7b67aecb341750e4

Snap for 6047316 from a766aad7998794ac62991fcd7b67aecb341750e4 to qt-qpr2-release

Change-Id: I58f7f714c7cec44ab16e14f1fe5892910219d4e9

generate-packages.sh

diff --git a/generate-packages.sh b/generate-packages.sh
index fb72dd4..ce4964d 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -153,12 +153,9 @@
     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