gms: Switch to new extract utilities.
Change-Id: I066fa45ff7921f1c57b9fedae9a843b04526920a
This commit is contained in:
Alexander Koskovich
parent
6356b379a1
commit
49785a3bec
|
|
@ -1,19 +1,9 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright (C) 2016 The CyanogenMod Project
|
||||
# Copyright (C) 2017-2020 The LineageOS Project
|
||||
# 2020 Paranoid Android
|
||||
#
|
||||
# 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.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
set -e
|
||||
|
|
@ -23,41 +13,49 @@ VENDOR=google
|
|||
|
||||
# Load extract utilities and do some sanity checks.
|
||||
MY_DIR="${BASH_SOURCE%/*}"
|
||||
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
|
||||
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
|
||||
|
||||
ROOT="$MY_DIR"/../../..
|
||||
ANDROID_ROOT="${MY_DIR}/../../.."
|
||||
|
||||
HELPER="$ROOT"/vendor/pa/build/tools/extract_utils.sh
|
||||
if [ ! -f "$HELPER" ]; then
|
||||
echo "Unable to find helper script at $HELPER"
|
||||
HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
|
||||
if [ ! -f "${HELPER}" ]; then
|
||||
echo "Unable to find helper script at ${HELPER}"
|
||||
exit 1
|
||||
fi
|
||||
. "$HELPER"
|
||||
source "${HELPER}"
|
||||
|
||||
# Default to sanitizing the vendor folder before extraction.
|
||||
CLEAN_VENDOR=true
|
||||
|
||||
while [ "$1" != "" ]; do
|
||||
case $1 in
|
||||
-n | --no-cleanup ) CLEAN_VENDOR=false
|
||||
;;
|
||||
-s | --section ) shift
|
||||
SECTION=$1
|
||||
CLEAN_VENDOR=false
|
||||
;;
|
||||
* ) SRC=$1
|
||||
;;
|
||||
KANG=
|
||||
SECTION=
|
||||
|
||||
while [ "${#}" -gt 0 ]; do
|
||||
case "${1}" in
|
||||
-n | --no-cleanup )
|
||||
CLEAN_VENDOR=false
|
||||
;;
|
||||
-k | --kang )
|
||||
KANG="--kang"
|
||||
;;
|
||||
-s | --section )
|
||||
SECTION="${2}"; shift
|
||||
CLEAN_VENDOR=false
|
||||
;;
|
||||
* )
|
||||
SRC="${1}"
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if [ -z "$SRC" ]; then
|
||||
SRC=adb
|
||||
if [ -z "${SRC}" ]; then
|
||||
SRC="adb"
|
||||
fi
|
||||
|
||||
# Initialize the helper.
|
||||
setup_vendor "$DEVICE" "$VENDOR" "$ROOT" false "$CLEAN_VENDOR"
|
||||
setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
|
||||
|
||||
extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION"
|
||||
extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
|
||||
|
||||
"$MY_DIR"/setup-makefiles.sh
|
||||
"${MY_DIR}/setup-makefiles.sh"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,9 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright (C) 2016 The CyanogenMod Project
|
||||
# 2017 The LineageOS Project
|
||||
# 2020 Paranoid Android
|
||||
# Copyright (C) 2017-2020 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.
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
set -e
|
||||
|
|
@ -22,30 +11,29 @@ set -e
|
|||
DEVICE=gms
|
||||
VENDOR=google
|
||||
|
||||
# Load extract utilities and do some sanity checks.
|
||||
# Load extract_utils and do some sanity checks
|
||||
MY_DIR="${BASH_SOURCE%/*}"
|
||||
if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
|
||||
if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
|
||||
|
||||
ROOT="$MY_DIR"/../../..
|
||||
ANDROID_ROOT="${MY_DIR}/../../.."
|
||||
|
||||
HELPER="$ROOT"/vendor/pa/build/tools/extract_utils.sh
|
||||
if [ ! -f "$HELPER" ]; then
|
||||
echo "Unable to find helper script at $HELPER"
|
||||
HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
|
||||
if [ ! -f "${HELPER}" ]; then
|
||||
echo "Unable to find helper script at ${HELPER}"
|
||||
exit 1
|
||||
fi
|
||||
. "$HELPER"
|
||||
source "${HELPER}"
|
||||
|
||||
# Initialize the helper.
|
||||
setup_vendor "$DEVICE" "$VENDOR" "$ROOT"
|
||||
# Initialize the helper
|
||||
setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
|
||||
|
||||
# Copyright headers and guards.
|
||||
write_headers "arm64"
|
||||
# Warning headers and guards
|
||||
write_headers
|
||||
|
||||
write_makefiles "$MY_DIR"/proprietary-files.txt true
|
||||
write_makefiles "${MY_DIR}/proprietary-files.txt" true
|
||||
|
||||
sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
|
||||
sed -i 's/gms/arm64/g' "$ANDROIDMK"
|
||||
sed -i -e '18i\\ninclude $(call all-makefiles-under,$(LOCAL_PATH))' "$ANDROIDMK"
|
||||
sed -i 's/by device/by vendor/g' "$ANDROIDBP"
|
||||
|
||||
# Finish
|
||||
|
|
|
|||
Loading…
Reference in New Issue