commit a766aad7998794ac62991fcd7b67aecb341750e4
author Bill Yi <byi@google.com> Mon Nov 04 15:41:56 2019 -0800
committer Bill Yi <byi@google.com> Tue Dec 03 19:19:44 2019 +0000
tree 0e90574064878f9b89fc9f9c01de3b033c55c153
parent 86679dc4aa80cedcbda853103637d92240cd9310

Copy Android.mk for all vendors

BUG:143903156
Merged-In: Ibea15ac3647ed4dca38bcf68ca336bc9154a7328
Change-Id: Ibea15ac3647ed4dca38bcf68ca336bc9154a7328
(cherry picked from commit d88009ebcfd9c2b53c7f2af6f1d12ec5725d8417)

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