android/vendor_gapps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gapps: Switch to standalone extract utils

Browse Source 
* Align with templates while we are at it

Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4
This commit is contained in:
Michael Bestas 2020-12-19 02:53:35 +02:00 committed by Alessandro Astone
parent 0b0fc16ee5
commit 3d60895de3
18 changed files with 33 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arm/Android.bp
View File

@ -1,20 +1,6 @@
/** // Automatically generated file. DO NOT MODIFY
* Copyright (C) 2019-2021 The LineageOS Project //
* // This file is generated by device/gapps/arm/setup-makefiles.sh
* 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.
*
* This file is generated by device/gapps/arm/setup-makefiles.sh
*/
soong_namespace { soong_namespace {
} }

14
arm/Android.mk
View File

@ -1,17 +1,5 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/arm/setup-makefiles.sh # This file is generated by device/gapps/arm/setup-makefiles.sh
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)

14
arm/BoardConfigVendor.mk
View File

@ -1,16 +1,4 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/arm/setup-makefiles.sh # This file is generated by device/gapps/arm/setup-makefiles.sh

14
arm/arm-vendor.mk
View File

@ -1,17 +1,5 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/arm/setup-makefiles.sh # This file is generated by device/gapps/arm/setup-makefiles.sh
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \

20
arm64/Android.bp
View File

@ -1,20 +1,6 @@
/** // Automatically generated file. DO NOT MODIFY
* Copyright (C) 2019-2021 The LineageOS Project //
* // This file is generated by device/gapps/arm64/setup-makefiles.sh
* 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.
*
* This file is generated by device/gapps/arm64/setup-makefiles.sh
*/
soong_namespace { soong_namespace {
} }

14
arm64/Android.mk
View File

@ -1,17 +1,5 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/arm64/setup-makefiles.sh # This file is generated by device/gapps/arm64/setup-makefiles.sh
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)

14
arm64/BoardConfigVendor.mk
View File

@ -1,16 +1,4 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/arm64/setup-makefiles.sh # This file is generated by device/gapps/arm64/setup-makefiles.sh

14
arm64/arm64-vendor.mk
View File

@ -1,17 +1,5 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/arm64/setup-makefiles.sh # This file is generated by device/gapps/arm64/setup-makefiles.sh
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \

20
common/Android.bp
View File

@ -1,20 +1,6 @@
/** // Automatically generated file. DO NOT MODIFY
* Copyright (C) 2019-2021 The LineageOS Project //
* // This file is generated by device/gapps/common/setup-makefiles.sh
* 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.
*
* This file is generated by device/gapps/common/setup-makefiles.sh
*/
soong_namespace { soong_namespace {
} }

14
common/Android.mk
View File

@ -1,17 +1,5 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/common/setup-makefiles.sh # This file is generated by device/gapps/common/setup-makefiles.sh
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)

14
common/BoardConfigVendor.mk
View File

@ -1,16 +1,4 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/common/setup-makefiles.sh # This file is generated by device/gapps/common/setup-makefiles.sh

14
common/common-vendor.mk
View File

@ -1,17 +1,5 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/common/setup-makefiles.sh # This file is generated by device/gapps/common/setup-makefiles.sh
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \

8
extract-files.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (C) 2016 The CyanogenMod Project # Copyright (C) 2016 The CyanogenMod Project
# Copyright (C) 2017-2018 The LineageOS Project # Copyright (C) 2017-2021 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -25,9 +25,9 @@ export VENDOR=gapps
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
LINEAGE_ROOT="$MY_DIR"/../.. ANDROID_ROOT="$MY_DIR/../.."
HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh HELPER="$ANDROID_ROOT/tools/extract-utils/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
@ -42,7 +42,7 @@ if [ -z "$SRC" ]; then
fi fi
# Initialize the helper for common gapps # Initialize the helper for common gapps
setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT" setup_vendor "$GAPPS_COMMON" "$VENDOR" "$ANDROID_ROOT"
extract "$MY_DIR"/proprietary-files-common.txt "$SRC" extract "$MY_DIR"/proprietary-files-common.txt "$SRC"
extract "$MY_DIR"/proprietary-files-common-nongrouper.txt "$SRC" extract "$MY_DIR"/proprietary-files-common-nongrouper.txt "$SRC"

12
setup-makefiles.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (C) 2016 The CyanogenMod Project # Copyright (C) 2016 The CyanogenMod Project
# Copyright (C) 2017-2018 The LineageOS Project # Copyright (C) 2017-2021 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -18,8 +18,6 @@
set -e set -e
export INITIAL_COPYRIGHT_YEAR=2017
export DEVICE_COMMON=common export DEVICE_COMMON=common
export VENDOR=gapps export VENDOR=gapps
@ -27,9 +25,9 @@ export VENDOR=gapps
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
LINEAGE_ROOT="$MY_DIR"/../.. ANDROID_ROOT="$MY_DIR/../.."
HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh HELPER="$ANDROID_ROOT/tools/extract-utils/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
@ -37,7 +35,7 @@ fi
. "$HELPER" . "$HELPER"
# Initialize the helper for common gapps # Initialize the helper for common gapps
setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true setup_vendor "$DEVICE_COMMON" "$VENDOR" "$ANDROID_ROOT" true
# Copyright headers # Copyright headers
write_headers "arm arm64 x86" write_headers "arm arm64 x86"
@ -59,7 +57,7 @@ write_footers
for DEVICE in arm arm64 x86; do for DEVICE in arm arm64 x86; do
# Reinitialize the helper for target gapps # Reinitialize the helper for target gapps
setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" setup_vendor "$DEVICE" "$VENDOR" "$ANDROID_ROOT"
# Copyright headers and guards # Copyright headers and guards
write_headers "$DEVICE" write_headers "$DEVICE"

20
x86/Android.bp
View File

@ -1,20 +1,6 @@
/** // Automatically generated file. DO NOT MODIFY
* Copyright (C) 2019-2021 The LineageOS Project //
* // This file is generated by device/gapps/x86/setup-makefiles.sh
* 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.
*
* This file is generated by device/gapps/x86/setup-makefiles.sh
*/
soong_namespace { soong_namespace {
} }

14
x86/Android.mk
View File

@ -1,17 +1,5 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/x86/setup-makefiles.sh # This file is generated by device/gapps/x86/setup-makefiles.sh
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)

14
x86/BoardConfigVendor.mk
View File

@ -1,16 +1,4 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/x86/setup-makefiles.sh # This file is generated by device/gapps/x86/setup-makefiles.sh

14
x86/x86-vendor.mk
View File

@ -1,17 +1,5 @@
# Copyright (C) 2017-2021 The LineageOS Project # Automatically generated file. DO NOT MODIFY
# #
# 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.
# This file is generated by device/gapps/x86/setup-makefiles.sh # This file is generated by device/gapps/x86/setup-makefiles.sh
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \