diff options
| author | Xin Li <delphij@google.com> | 2019-05-13 15:38:44 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-05-13 15:38:44 -0700 |
| commit | eddce9d082f9742f710371712497e7823d2c7314 (patch) | |
| tree | 5cb50c27daf76bb004a038df3b711f42a1266c72 | |
| parent | 5d6174176c573387a77cf1f58c6bccb72dcc06fc (diff) | |
| parent | ab16b728a9cde89eb68942d03225d2d8f264727b (diff) | |
| download | common-temp_b_132622481_stage-aosp-master.tar.gz | |
DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-mastertemp_b_132622481_stage-aosp-master
Bug: 132622481
Change-Id: I480712de316ab28f8bc17f2f42e916e7e7285bc3
| -rwxr-xr-x | generate-packages.sh | 51 |
1 files changed, 13 insertions, 38 deletions
diff --git a/generate-packages.sh b/generate-packages.sh index 5d55c33..d3b1ff4 100755 --- a/generate-packages.sh +++ b/generate-packages.sh @@ -55,14 +55,6 @@ do TO_EXTRACT=`sed -n -e '/'" $COMPANY"'/,/;;/ p' $EXTRACT_LIST_FILENAME | tail -n+3 | head -n-2 | sed -e 's/\\\//g'` - # Check if TO_EXTRACT list has any APK files - if [[ ${TO_EXTRACT} == *.apk* ]] - then - APK_MAKEFILE=${FILEDIR}/Android.mk - echo "LOCAL_PATH := \$(call my-dir)" > ${APK_MAKEFILE} - echo "" >> ${APK_MAKEFILE} - fi - echo \ \ Extracting files from OTA package for ONE_FILE in $TO_EXTRACT do @@ -84,36 +76,6 @@ do FILEDIR_NEW=$FILEDIR fi - # apk makefile - if [[ ${ONE_FILE} == *.apk ]] - then - TMP_ONE_FILE_NAME=$(basename ${ONE_FILE} | sed 's/.apk//g') - - echo "include \$(CLEAR_VARS)" >> ${APK_MAKEFILE} - - echo "LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX)" >> ${APK_MAKEFILE} - echo "LOCAL_MODULE := ${TMP_ONE_FILE_NAME}" >> ${APK_MAKEFILE} - echo "LOCAL_MODULE_TAGS := optional" >> ${APK_MAKEFILE} - echo "LOCAL_BUILT_MODULE_STEM := package.apk" >> ${APK_MAKEFILE} - echo "LOCAL_MODULE_OWNER := ${COMPANY}" >> ${APK_MAKEFILE} - echo "LOCAL_MODULE_CLASS := APPS" >> ${APK_MAKEFILE} - echo "LOCAL_SRC_FILES := \$(LOCAL_MODULE).apk" >> ${APK_MAKEFILE} - echo "LOCAL_CERTIFICATE := PRESIGNED" >> ${APK_MAKEFILE} - - if [[ ${ONE_FILE} == *priv-app/* ]] - then - echo "LOCAL_PRIVILEGED_MODULE := true" >> ${APK_MAKEFILE} - fi - - if [[ ${TMP_ONE_FILE_NAME} == "LeanbackLauncher" ]] - then - echo "LOCAL_OVERRIDES_PACKAGES := Launcher2" >> ${APK_MAKEFILE} - fi - - echo "include \$(BUILD_PREBUILT)" >> ${APK_MAKEFILE} - echo "" >> ${APK_MAKEFILE} - fi - echo \ \ \ \ Extracting $ONE_FILE unzip -j -o $ZIP $ONE_FILE -d $FILEDIR_NEW> /dev/null || echo \ \ \ \ Error extracting $ONE_FILE if test ${ONE_FILE,,} = system/vendor/bin/gpsd -o ${ONE_FILE,,} = system/vendor/bin/pvrsrvinit -o ${ONE_FILE,,} = system/bin/fRom @@ -182,6 +144,19 @@ do mv ${FILEDIR_ROOT}/proprietary/device-vendor.mk ${FILEDIR_ROOT_SHARE} fi + if [[ ${COMPANY} == qcom ]] + then + case ${ROOTDEVICE} in + marlin|sailfish|taimen|walleye|crosshatch|blueline|bonito|sargo) + if [[ -e "${MAKEFILEDIR}/Android.mk" ]] + then + mv ${MAKEFILEDIR}/Android.mk ${FILEDIR}/ + fi + ;; + *) ;; + esac + fi + echo \ \ Generating self-extracting script SCRIPT=extract-$COMPANY-$DEVICE.sh cat PROLOGUE > tmp/$SCRIPT || echo \ \ \ \ Error generating script |