sanders: Sync proprietary-files.txt with our vendor
* also update scripts
This commit is contained in:
78
extract-files.sh
Normal file → Executable file
78
extract-files.sh
Normal file → Executable file
@@ -1,18 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# Copyright (C) 2016 The CyanogenMod Project
|
# Copyright (C) 2018-2019 The LineageOS Project
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
# 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
|
set -e
|
||||||
@@ -20,42 +10,58 @@ set -e
|
|||||||
DEVICE=sanders
|
DEVICE=sanders
|
||||||
VENDOR=motorola
|
VENDOR=motorola
|
||||||
|
|
||||||
# Load extractutils and do some sanity checks
|
# Load extract_utils and do some sanity checks
|
||||||
MY_DIR="${BASH_SOURCE%/*}"
|
MY_DIR="${BASH_SOURCE%/*}"
|
||||||
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
|
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
|
||||||
|
|
||||||
CM_ROOT="$MY_DIR"/../../..
|
LINEAGE_ROOT="${MY_DIR}"/../../..
|
||||||
|
|
||||||
HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
|
HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
|
||||||
if [ ! -f "$HELPER" ]; then
|
if [ ! -f "${HELPER}" ]; then
|
||||||
echo "Unable to find helper script at $HELPER"
|
echo "Unable to find helper script at ${HELPER}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$HELPER"
|
source "${HELPER}"
|
||||||
|
|
||||||
if [ $# -eq 0 ]; then
|
# Default to sanitizing the vendor folder before extraction
|
||||||
SRC=adb
|
CLEAN_VENDOR=true
|
||||||
else
|
|
||||||
if [ $# -eq 1 ]; then
|
SECTION=
|
||||||
SRC=$1
|
KANG=
|
||||||
else
|
|
||||||
echo "$0: bad number of arguments"
|
while [ "${#}" -gt 0 ]; do
|
||||||
echo ""
|
case "${1}" in
|
||||||
echo "usage: $0 [PATH_TO_EXPANDED_ROM]"
|
-n | --no-cleanup )
|
||||||
echo ""
|
CLEAN_VENDOR=false
|
||||||
echo "If PATH_TO_EXPANDED_ROM is not specified, blobs will be extracted from"
|
;;
|
||||||
echo "the device using adb pull."
|
-k | --kang )
|
||||||
exit 1
|
KANG="--kang"
|
||||||
fi
|
;;
|
||||||
|
-s | --section )
|
||||||
|
SECTION="${2}"; shift
|
||||||
|
CLEAN_VENDOR=false
|
||||||
|
;;
|
||||||
|
* )
|
||||||
|
SRC="${1}"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -z "${SRC}" ]; then
|
||||||
|
SRC="adb"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Initialize the helper
|
# Initialize the helper
|
||||||
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
|
setup_vendor "${DEVICE}" "${VENDOR}" "${AOSP_ROOT}" true "${CLEAN_VENDOR}"
|
||||||
|
|
||||||
extract "$MY_DIR"/proprietary-files.txt "$SRC"
|
extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \
|
||||||
|
"${KANG}" --section "${SECTION}"
|
||||||
|
|
||||||
|
BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE}/proprietary"
|
||||||
|
|
||||||
# Add uhid group for fingerprint service
|
# Add uhid group for fingerprint service
|
||||||
FP_SERVICE_RC="$BLOB_ROOT"/vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc
|
FP_SERVICE_RC="$BLOB_ROOT"/vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service.rc
|
||||||
sed -i "s/input/uhid input/" "$FP_SERVICE_RC"
|
sed -i "s/input/uhid input/" "$FP_SERVICE_RC"
|
||||||
|
|
||||||
"$MY_DIR"/setup-makefiles.sh
|
"${MY_DIR}/setup-makefiles.sh"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
38
setup-makefiles.sh
Normal file → Executable file
38
setup-makefiles.sh
Normal file → Executable file
@@ -1,47 +1,37 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# Copyright (C) 2016 The CyanogenMod Project
|
# Copyright (C) 2018-2019 The LineageOS Project
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
# 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
|
set -e
|
||||||
|
|
||||||
# Required!
|
|
||||||
DEVICE=sanders
|
DEVICE=sanders
|
||||||
VENDOR=motorola
|
VENDOR=motorola
|
||||||
|
|
||||||
# Load extractutils and do some sanity checks
|
INITIAL_COPYRIGHT_YEAR=2019
|
||||||
|
|
||||||
|
# Load extract_utils and do some sanity checks
|
||||||
MY_DIR="${BASH_SOURCE%/*}"
|
MY_DIR="${BASH_SOURCE%/*}"
|
||||||
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
|
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
|
||||||
|
|
||||||
CM_ROOT="$MY_DIR"/../../..
|
LINEAGE_ROOT="${MY_DIR}/../../.."
|
||||||
|
|
||||||
HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
|
HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
|
||||||
if [ ! -f "$HELPER" ]; then
|
if [ ! -f "${HELPER}" ]; then
|
||||||
echo "Unable to find helper script at $HELPER"
|
echo "Unable to find helper script at ${HELPER}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$HELPER"
|
source "${HELPER}"
|
||||||
|
|
||||||
# Initialize the helper
|
# Initialize the helper
|
||||||
setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
|
setup_vendor "${DEVICE}" "${VENDOR}" "${LINEAGE_ROOT}"
|
||||||
|
|
||||||
# Copyright headers and guards
|
# Copyright headers and guards
|
||||||
write_headers
|
write_headers
|
||||||
|
|
||||||
# The standard blobs
|
write_makefiles "${MY_DIR}/proprietary-files.txt" true
|
||||||
write_makefiles "$MY_DIR"/proprietary-files.txt
|
|
||||||
|
|
||||||
# We are done!
|
# Finish
|
||||||
write_footers
|
write_footers
|
||||||
|
|||||||
Reference in New Issue
Block a user