diff options
| -rw-r--r-- | extract-files.sh | 98 | ||||
| -rwxr-xr-x | setup-makefiles.sh | 360 |
2 files changed, 249 insertions, 209 deletions
diff --git a/extract-files.sh b/extract-files.sh index b7529ef..0f9c23b 100644 --- a/extract-files.sh +++ b/extract-files.sh @@ -1,58 +1,60 @@ #!/bin/bash -# -# 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. -# 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. -# - -set -e - -DEVICE=z2_plus VENDOR=zuk +DEVICE=z2_plus -# Load extract_utils and do some sanity checks -MY_DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi - -CM_ROOT="$MY_DIR"/../../.. - -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" +function extract() { + for FILE in `egrep -v '(^#|^$)' $1`; do + OLDIFS=$IFS IFS=":" PARSING_ARRAY=($FILE) IFS=$OLDIFS + FILE=`echo ${PARSING_ARRAY[0]} | sed -e "s/^-//g"` + DEST=${PARSING_ARRAY[1]} + if [ -z $DEST ]; then + DEST=$FILE + fi + DIR=`dirname $FILE` + if [ ! -d $2/$DIR ]; then + mkdir -p $2/$DIR + fi + if [ "$SRC" = "adb" ]; then + # Try CM target first + adb pull /system/$DEST $2/$DEST + # if file does not exist try OEM target + if [ "$?" != "0" ]; then + adb pull /system/$FILE $2/$DEST + fi + else + cp $SRC/system/$FILE $2/$DEST + # if file dot not exist try destination + if [ "$?" != "0" ] + then + cp $SRC/system/$DEST $2/$DEST + fi + fi + done +} if [ $# -eq 0 ]; then - SRC=adb + SRC=adb else - if [ $# -eq 1 ]; then - SRC=$1 - else - echo "$0: bad number of arguments" - echo "" - echo "usage: $0 [PATH_TO_EXPANDED_ROM]" - echo "" - echo "If PATH_TO_EXPANDED_ROM is not specified, blobs will be extracted from" - echo "the device using adb pull." - exit 1 - fi + if [ $# -eq 1 ]; then + SRC=$1 + else + echo "$0: bad number of arguments" + echo "" + echo "usage: $0 [PATH_TO_EXPANDED_ROM]" + echo "" + echo "If PATH_TO_EXPANDED_ROM is not specified, blobs will be extracted from" + echo "the device using adb pull." + exit 1 + fi fi -# Initialize the helper -setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT" +BASE=../../../vendor/$VENDOR/$DEVICE/proprietary +rm -rf $BASE/* + +DEVBASE=../../../vendor/$VENDOR/$DEVICE/proprietary +rm -rf $DEVBASE/* -extract "$MY_DIR"/proprietary-files.txt "$SRC" +extract ../../$VENDOR/$DEVICE/proprietary-files.txt $BASE +extract ../../$VENDOR/$DEVICE/proprietary-files.txt $DEVBASE -"$MY_DIR"/setup-makefiles.sh +./setup-makefiles.sh diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 2304bf5..58d4ced 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -1,7 +1,12 @@ #!/bin/bash -# -# Copyright (C) 2013-2016, The CyanogenMod Project -# Copyright (C) 2017, The LineageOS Project +VENDOR=zuk +DEVICE=z2_plus + +OUTDIR=vendor/$VENDOR/$DEVICE +MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.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. @@ -14,249 +19,282 @@ # 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. -# -set -e +PRODUCT_COPY_FILES += \\ +EOF -# Required! -DEVICE=z2_plus -VENDOR=zuk +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 + +(cat << EOF) > ../../../$OUTDIR/$DEVICE-vendor.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. -# Load extractutils and do some sanity checks -MY_DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi +# Pick up overlay for features that depend on non-open-source files -CM_ROOT="$MY_DIR"/../../.. +\$(call inherit-product, vendor/$VENDOR/$DEVICE/$DEVICE-vendor-blobs.mk) +EOF -# Qualcomm BSP blobs - we put a conditional around here -# in case the BSP is actually being built -printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$PRODUCTMK" -printf '\n%s\n' "ifeq (\$(QCPATH),)" >> "$ANDROIDMK" +OUTDIR=vendor/$VENDOR/$DEVICE +MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk +(cat << EOF) >> $MAKEFILE -# Qualcomm performance blobs - conditional as well -# in order to support LineageOS builds +# 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. -endif +# Pick up overlay for features that depend on non-open-source files +PRODUCT_PACKAGES += \\ + libloc_api_v02 \\ + libtime_genoff \\ + datastatusnotification \\ + QtiTelephonyService \\ + shutdownlistener \\ + TimeService \\ + CNEService \\ + com.qualcomm.location \\ + qcrilmsgtunnel \\ + colorservice \\ + qcrilhook \\ + com.qualcomm.qti.Performance.xml \\ + libqti_performance \\ + QPerformance --include vendor/extra/devices.mk -ifneq (\$(call is-qc-perf-target),true) EOF -cat << EOF >> "$ANDROIDMK" -endif - -ifneq (\$(TARGET_HAVE_QC_PERF),true) +(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 - -<<<<<<< HEAD - -echo "endif" >> "$PRODUCTMK" - -cat << EOF >> "$ANDROIDMK" -======= -# This file is generated by device/$VENDOR/$DEVICE/setup-makefiles.sh +(cat << EOF) > ../../../$OUTDIR/Android.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. LOCAL_PATH := \$(call my-dir) -ifeq (\$(TARGET_DEVICE),gemini) - include \$(CLEAR_VARS) -LOCAL_MODULE := TimeService -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +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_SRC_FILES := proprietary/app/TimeService/TimeService.apk -LOCAL_CERTIFICATE := platform +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := .so include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := qcrilmsgtunnel -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +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_PRIVILEGED_MODULE := true -LOCAL_SRC_FILES := proprietary/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk -LOCAL_CERTIFICATE := platform +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := .so +LOCAL_PROPRIETARY_MODULE := true include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := shutdownlistener -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := proprietary/app/shutdownlistener/shutdownlistener.apk +LOCAL_MODULE := datastatusnotification +LOCAL_MODULE_OWNER := zuk +LOCAL_SRC_FILES := proprietary/app/datastatusnotification/datastatusnotification.apk LOCAL_CERTIFICATE := platform -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := qcnvitems -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_JAVA_PACKAGE_SUFFIX) LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := proprietary/framework/qcnvitems.jar -LOCAL_CERTIFICATE := PRESIGNED +LOCAL_MODULE_CLASS := APPS +LOCAL_DEX_PREOPT := false +LOCAL_MODULE_SUFFIX := .apk include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := qcrilhook -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_JAVA_PACKAGE_SUFFIX) +LOCAL_MODULE := QtiTelephonyService +LOCAL_MODULE_OWNER := zuk +LOCAL_SRC_FILES := proprietary/app/QtiTelephonyService/QtiTelephonyService.apk +LOCAL_CERTIFICATE := platform LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := proprietary/framework/qcrilhook.jar -LOCAL_CERTIFICATE := PRESIGNED +LOCAL_MODULE_CLASS := APPS +LOCAL_DEX_PREOPT := false +LOCAL_MODULE_SUFFIX := .apk include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libloc_api_v02 -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_SHARED_LIBRARIES) -LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_SHARED_LIBRARIES) -LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE := shutdownlistener +LOCAL_MODULE_OWNER := zuk +LOCAL_SRC_FILES := proprietary/app/shutdownlistener/shutdownlistener.apk +LOCAL_CERTIFICATE := platform LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES_64 := proprietary/lib64/libloc_api_v02.so -LOCAL_SRC_FILES_32 := proprietary/lib/libloc_api_v02.so -LOCAL_MULTILIB := both +LOCAL_MODULE_CLASS := APPS +LOCAL_DEX_PREOPT := false +LOCAL_MODULE_SUFFIX := .apk include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libloc_ds_api -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_SHARED_LIBRARIES) -LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_SHARED_LIBRARIES) -LOCAL_MODULE_SUFFIX := .so +LOCAL_MODULE := TimeService +LOCAL_MODULE_OWNER := zuk +LOCAL_SRC_FILES := proprietary/app/TimeService/TimeService.apk +LOCAL_CERTIFICATE := platform LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES_64 := proprietary/lib64/libloc_ds_api.so -LOCAL_SRC_FILES_32 := proprietary/lib/libloc_ds_api.so -LOCAL_MULTILIB := both +LOCAL_MODULE_CLASS := APPS +LOCAL_DEX_PREOPT := false +LOCAL_MODULE_SUFFIX := .apk include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -<<<<<<< HEAD -======= LOCAL_MODULE := CNEService -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE_TAGS := optional -LOCAL_PRIVILEGED_MODULE := true +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) include \$(CLEAR_VARS) LOCAL_MODULE := com.qualcomm.location -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE_TAGS := optional -LOCAL_PRIVILEGED_MODULE := true +LOCAL_MODULE_OWNER := zuk LOCAL_SRC_FILES := proprietary/priv-app/com.qualcomm.location/com.qualcomm.location.apk LOCAL_CERTIFICATE := platform -include \$(BUILD_PREBUILT) - -include \$(CLEAR_VARS) -LOCAL_MODULE := dpmserviceapp -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := APPS +LOCAL_DEX_PREOPT := false +LOCAL_MODULE_SUFFIX := .apk LOCAL_PRIVILEGED_MODULE := true -LOCAL_SRC_FILES := proprietary/priv-app/dpmserviceapp/dpmserviceapp.apk -LOCAL_CERTIFICATE := platform include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) LOCAL_MODULE := qcrilmsgtunnel -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE_TAGS := optional -LOCAL_PRIVILEGED_MODULE := true +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) include \$(CLEAR_VARS) -LOCAL_MODULE := QtiTetherService -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE_TAGS := optional -LOCAL_PRIVILEGED_MODULE := true -LOCAL_SRC_FILES := proprietary/priv-app/QtiTetherService/QtiTetherService.apk +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) include \$(CLEAR_VARS) -LOCAL_MODULE := ims -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) +LOCAL_MODULE := qcrilhook +LOCAL_MODULE_OWNER := zuk +LOCAL_SRC_FILES := proprietary/framework/qcrilhook.jar LOCAL_MODULE_TAGS := optional -LOCAL_PROPRIETARY_MODULE := true -LOCAL_SRC_FILES := proprietary/vendor/app/ims/ims.apk -LOCAL_CERTIFICATE := platform +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_MODULE_SUFFIX := .jar include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) LOCAL_MODULE := imssettings -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := \$(COMMON_ANDROID_PACKAGE_SUFFIX) -LOCAL_MODULE_TAGS := optional -LOCAL_PROPRIETARY_MODULE := true +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) include \$(CLEAR_VARS) ->>>>>>> 05c9d04... gemini: Enable QC location services -LOCAL_MODULE := libTimeService -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_OWNER := $VENDOR -LOCAL_MODULE_SUFFIX := .so +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_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) -LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) -LOCAL_MULTILIB := both +LOCAL_MODULE_CLASS := APPS +LOCAL_DEX_PREOPT := false +LOCAL_MODULE_SUFFIX := .apk LOCAL_PROPRIETARY_MODULE := true -LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libTimeService.so -LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libTimeService.so include \$(BUILD_PREBUILT) include \$(CLEAR_VARS) -LOCAL_MODULE := libtime_genoff +LOCAL_MODULE := libsdm-disp-apis +LOCAL_MODULE_OWNER := zuk +LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libsdm-disp-apis.so +LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libsdm-disp-apis.so +LOCAL_MULTILIB := both +LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_OWNER := $VENDOR LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH_64 := \$(TARGET_OUT_VENDOR_SHARED_LIBRARIES) -LOCAL_MODULE_PATH_32 := \$(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES) -LOCAL_MULTILIB := both LOCAL_PROPRIETARY_MODULE := true -LOCAL_SRC_FILES_64 := proprietary/vendor/lib64/libtime_genoff.so -LOCAL_SRC_FILES_32 := proprietary/vendor/lib/libtime_genoff.so include \$(BUILD_PREBUILT) -\$(shell mkdir -p \$(PRODUCT_OUT)/system/vendor/lib/egl && pushd \$(PRODUCT_OUT)/system/vendor/lib > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null) -\$(shell mkdir -p \$(PRODUCT_OUT)/system/vendor/lib64/egl && pushd \$(PRODUCT_OUT)/system/vendor/lib64 > /dev/null && ln -s egl/libEGL_adreno.so libEGL_adreno.so && popd > /dev/null) ->>>>>>> e90222e... gemini: Build GPS HAL from source - -endif +\$(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) EOF - -printf '\n%s\n' "\$(call inherit-product, vendor/qcom/binaries/msm8996/graphics/graphics-vendor.mk)" >> "$PRODUCTMK" - -# We are done! -write_footers - |