From 191db404b4c2574513a92aa7cfd1f1f29cfe31c2 Mon Sep 17 00:00:00 2001 From: dd3boh Date: Tue, 31 Oct 2017 12:46:40 +0100 Subject: z2_plus: Setup proprietary-files and the setup makefile script as they should be Signed-off-by: dd3boh --- setup-makefiles.sh | 287 +++++++---------------------------------------------- 1 file changed, 37 insertions(+), 250 deletions(-) (limited to 'setup-makefiles.sh') diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 67bafa6..af91e75 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -1,90 +1,7 @@ #!/bin/bash -VENDOR=zuk -DEVICE=z2_plus - -OUTDIR=vendor/$VENDOR/$DEVICE -MAKEFILE=../../../$OUTDIR/$DEVICE-vendor.mk - -(cat << EOF) > $MAKEFILE -# Copyright (C) 2016 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -PRODUCT_COPY_FILES += \\ -EOF - -LINEEND=" \\" -COUNT=`wc -l proprietary-files.txt | awk {'print $1'}` -DISM=`egrep -c '(^#|^$)' proprietary-files.txt` -COUNT=`expr $COUNT - $DISM` -for FILE in `egrep -v '(^#|^$)' proprietary-files.txt`; do - COUNT=`expr $COUNT - 1` - if [ $COUNT = "0" ]; then - LINEEND="" - fi - # Split the file from the destination (format is "file[:destination]") - OLDIFS=$IFS IFS=":" PARSING_ARRAY=($FILE) IFS=$OLDIFS - if [[ ! "$FILE" =~ ^-.* ]]; then - FILE=`echo ${PARSING_ARRAY[0]} | sed -e "s/^-//g"` - DEST=${PARSING_ARRAY[1]} - if [ -n "$DEST" ]; then - FILE=$DEST - fi - echo " $OUTDIR/proprietary/$FILE:system/$FILE$LINEEND" >> $MAKEFILE - fi -done - -OUTDIR=vendor/$VENDOR/$DEVICE -MAKEFILE=../../../$OUTDIR/$DEVICE-vendor.mk - -(cat << EOF) >> $MAKEFILE - -PRODUCT_PACKAGES += \\ - libloc_api_v02 \\ - libsdm-disp-vndapis \\ - libgpustats \\ - libtime_genoff \\ - datastatusnotification \\ - QtiTelephonyService \\ - shutdownlistener \\ - TimeService \\ - CNEService \\ - com.qualcomm.location \\ - qcrilmsgtunnel \\ - colorservice \\ - qcrilhook \\ - ims \\ - imssettings -EOF - -(cat << EOF) > ../../../$OUTDIR/BoardConfigVendor.mk -# Copyright (C) 2016 The CyanogenMod Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -EOF - -(cat << EOF) > ../../../$OUTDIR/Android.mk # Copyright (C) 2016 The CyanogenMod Project +# Copyright (C) 2017 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -97,184 +14,54 @@ EOF # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# -LOCAL_PATH := \$(call my-dir) - -ifeq (\$(TARGET_DEVICE),$DEVICE) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libloc_api_v02 -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/lib64/libloc_api_v02.so -LOCAL_MULTILIB := 64 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := libtime_genoff -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libtime_genoff.so -LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libtime_genoff.so -LOCAL_MULTILIB := both -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -LOCAL_PROPRIETARY_MODULE := true -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := datastatusnotification -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/app/datastatusnotification/datastatusnotification.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -include \$(BUILD_PREBUILT) +set -e -include \$(CLEAR_VARS) -LOCAL_MODULE := QtiTelephonyService -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/app/QtiTelephonyService/QtiTelephonyService.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -include \$(BUILD_PREBUILT) +# Required! +export DEVICE=z2_plus +export VENDOR=zuk -include \$(CLEAR_VARS) -LOCAL_MODULE := shutdownlistener -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/app/shutdownlistener/shutdownlistener.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -include \$(BUILD_PREBUILT) +export DEVICE_BRINGUP_YEAR=2016 -include \$(CLEAR_VARS) -LOCAL_MODULE := TimeService -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/app/TimeService/TimeService.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -include \$(BUILD_PREBUILT) +INITIAL_COPYRIGHT_YEAR=2017 -include \$(CLEAR_VARS) -LOCAL_MODULE := CNEService -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/priv-app/CNEService/CNEService.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -include \$(BUILD_PREBUILT) +# Load extract_utils and do some sanity checks +MY_DIR="${BASH_SOURCE%/*}" +if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi -include \$(CLEAR_VARS) -LOCAL_MODULE := com.qualcomm.location -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -include \$(BUILD_PREBUILT) +CM_ROOT="$MY_DIR"/../../.. -include \$(CLEAR_VARS) -LOCAL_MODULE := qcrilmsgtunnel -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -include \$(BUILD_PREBUILT) +HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh +if [ ! -f "$HELPER" ]; then + echo "Unable to find helper script at $HELPER" + exit 1 +fi +. "$HELPER" -include \$(CLEAR_VARS) -LOCAL_MODULE := colorservice -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/vendor/app/colorservice/colorservice.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PROPRIETARY_MODULE := true -include \$(BUILD_PREBUILT) +# Initialize the helper for common +setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" true -include \$(CLEAR_VARS) -LOCAL_MODULE := qcrilhook -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/framework/qcrilhook.jar -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_SUFFIX := .jar -include \$(BUILD_PREBUILT) +# Copyright headers and guards +write_headers "z2_plus" -include \$(CLEAR_VARS) -LOCAL_MODULE := imssettings -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/vendor/app/imssettings/imssettings.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PROPRIETARY_MODULE := true -include \$(BUILD_PREBUILT) +# The standard common blobs +write_makefiles "$MY_DIR"/proprietary-files.txt -include \$(CLEAR_VARS) -LOCAL_MODULE := ims -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES := proprietary/vendor/app/ims/ims.apk -LOCAL_CERTIFICATE := platform -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PROPRIETARY_MODULE := true -include \$(BUILD_PREBUILT) +# We are done! +write_footers -include \$(CLEAR_VARS) -LOCAL_MODULE := libsdm-disp-vndapis -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libsdm-disp-vndapis.so -LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libsdm-disp-vndapis.so -LOCAL_MULTILIB := both -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -LOCAL_PROPRIETARY_MODULE := true -include \$(BUILD_PREBUILT) +if [ -s "$MY_DIR"/../"$DEVICE"/proprietary-files.txt ]; then + # Reinitialize the helper for device + INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR" + setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" false -include \$(CLEAR_VARS) -LOCAL_MODULE := libgpustats -LOCAL_MODULE_OWNER := zuk -LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libgpustats.so -LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libgpustats.so -LOCAL_MULTILIB := both -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_SUFFIX := .so -LOCAL_PROPRIETARY_MODULE := true -include \$(BUILD_PREBUILT) + # Copyright headers and guards + write_headers -\$(shell mkdir -p \$(PRODUCT_OUT)/proprietary/lib/egl && pushd \$(PRODUCT_OUT)/proprietary/lib > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null) -\$(shell mkdir -p \$(PRODUCT_OUT)/proprietary/lib64/egl && pushd \$(PRODUCT_OUT)/proprietary/lib64 > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null) + # The standard device blobs + write_makefiles "$MY_DIR"/../"$DEVICE"/proprietary-files.txt -endif -EOF + # We are done! + write_footers +fi -- cgit v1.2.3