From 3d60895de3620b15ca5f240be97957db66d4988a Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 19 Dec 2020 02:53:35 +0200 Subject: [PATCH] gapps: Switch to standalone extract utils * Align with templates while we are at it Change-Id: Ife50623a3d1b8733f5cc76995c982d8950d39ad4 --- arm/Android.bp | 20 +++----------------- arm/Android.mk | 14 +------------- arm/BoardConfigVendor.mk | 14 +------------- arm/arm-vendor.mk | 14 +------------- arm64/Android.bp | 20 +++----------------- arm64/Android.mk | 14 +------------- arm64/BoardConfigVendor.mk | 14 +------------- arm64/arm64-vendor.mk | 14 +------------- common/Android.bp | 20 +++----------------- common/Android.mk | 14 +------------- common/BoardConfigVendor.mk | 14 +------------- common/common-vendor.mk | 14 +------------- extract-files.sh | 8 ++++---- setup-makefiles.sh | 12 +++++------- x86/Android.bp | 20 +++----------------- x86/Android.mk | 14 +------------- x86/BoardConfigVendor.mk | 14 +------------- x86/x86-vendor.mk | 14 +------------- 18 files changed, 33 insertions(+), 235 deletions(-) diff --git a/arm/Android.bp b/arm/Android.bp index d8a7c8e..2d7fe2b 100644 --- a/arm/Android.bp +++ b/arm/Android.bp @@ -1,20 +1,6 @@ -/** - * Copyright (C) 2019-2021 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. - * - * This file is generated by device/gapps/arm/setup-makefiles.sh - */ +// Automatically generated file. DO NOT MODIFY +// +// This file is generated by device/gapps/arm/setup-makefiles.sh soong_namespace { } diff --git a/arm/Android.mk b/arm/Android.mk index 3db2a48..be03a9e 100644 --- a/arm/Android.mk +++ b/arm/Android.mk @@ -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 LOCAL_PATH := $(call my-dir) diff --git a/arm/BoardConfigVendor.mk b/arm/BoardConfigVendor.mk index 6e3db58..9b6e0bf 100644 --- a/arm/BoardConfigVendor.mk +++ b/arm/BoardConfigVendor.mk @@ -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 diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk index a5e1f57..a2682f7 100644 --- a/arm/arm-vendor.mk +++ b/arm/arm-vendor.mk @@ -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 PRODUCT_SOONG_NAMESPACES += \ diff --git a/arm64/Android.bp b/arm64/Android.bp index 0d39bc3..42b51aa 100644 --- a/arm64/Android.bp +++ b/arm64/Android.bp @@ -1,20 +1,6 @@ -/** - * Copyright (C) 2019-2021 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. - * - * This file is generated by device/gapps/arm64/setup-makefiles.sh - */ +// Automatically generated file. DO NOT MODIFY +// +// This file is generated by device/gapps/arm64/setup-makefiles.sh soong_namespace { } diff --git a/arm64/Android.mk b/arm64/Android.mk index 9529c81..78d075a 100644 --- a/arm64/Android.mk +++ b/arm64/Android.mk @@ -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 LOCAL_PATH := $(call my-dir) diff --git a/arm64/BoardConfigVendor.mk b/arm64/BoardConfigVendor.mk index a5a2e11..f1106eb 100644 --- a/arm64/BoardConfigVendor.mk +++ b/arm64/BoardConfigVendor.mk @@ -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 diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk index f6a7a5b..6a61b08 100644 --- a/arm64/arm64-vendor.mk +++ b/arm64/arm64-vendor.mk @@ -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 PRODUCT_SOONG_NAMESPACES += \ diff --git a/common/Android.bp b/common/Android.bp index 8e61b8f..6eb35c4 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -1,20 +1,6 @@ -/** - * Copyright (C) 2019-2021 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. - * - * This file is generated by device/gapps/common/setup-makefiles.sh - */ +// Automatically generated file. DO NOT MODIFY +// +// This file is generated by device/gapps/common/setup-makefiles.sh soong_namespace { } diff --git a/common/Android.mk b/common/Android.mk index 7619c16..060670c 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -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 LOCAL_PATH := $(call my-dir) diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk index 1ba2603..9ed4296 100644 --- a/common/BoardConfigVendor.mk +++ b/common/BoardConfigVendor.mk @@ -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 diff --git a/common/common-vendor.mk b/common/common-vendor.mk index cc00a71..4cd2886 100644 --- a/common/common-vendor.mk +++ b/common/common-vendor.mk @@ -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 PRODUCT_SOONG_NAMESPACES += \ diff --git a/extract-files.sh b/extract-files.sh index 675c4dc..e49458d 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -1,7 +1,7 @@ #!/bin/bash # # 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"); # you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ export VENDOR=gapps MY_DIR="${BASH_SOURCE%/*}" 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 echo "Unable to find helper script at $HELPER" exit 1 @@ -42,7 +42,7 @@ if [ -z "$SRC" ]; then fi # 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-nongrouper.txt "$SRC" diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 3d408a3..792db97 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -1,7 +1,7 @@ #!/bin/bash # # 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"); # you may not use this file except in compliance with the License. @@ -18,8 +18,6 @@ set -e -export INITIAL_COPYRIGHT_YEAR=2017 - export DEVICE_COMMON=common export VENDOR=gapps @@ -27,9 +25,9 @@ export VENDOR=gapps MY_DIR="${BASH_SOURCE%/*}" 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 echo "Unable to find helper script at $HELPER" exit 1 @@ -37,7 +35,7 @@ fi . "$HELPER" # Initialize the helper for common gapps -setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true +setup_vendor "$DEVICE_COMMON" "$VENDOR" "$ANDROID_ROOT" true # Copyright headers write_headers "arm arm64 x86" @@ -59,7 +57,7 @@ write_footers for DEVICE in arm arm64 x86; do # Reinitialize the helper for target gapps -setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" +setup_vendor "$DEVICE" "$VENDOR" "$ANDROID_ROOT" # Copyright headers and guards write_headers "$DEVICE" diff --git a/x86/Android.bp b/x86/Android.bp index 97c6271..4838e26 100644 --- a/x86/Android.bp +++ b/x86/Android.bp @@ -1,20 +1,6 @@ -/** - * Copyright (C) 2019-2021 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. - * - * This file is generated by device/gapps/x86/setup-makefiles.sh - */ +// Automatically generated file. DO NOT MODIFY +// +// This file is generated by device/gapps/x86/setup-makefiles.sh soong_namespace { } diff --git a/x86/Android.mk b/x86/Android.mk index 0183375..11c7a3b 100644 --- a/x86/Android.mk +++ b/x86/Android.mk @@ -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 LOCAL_PATH := $(call my-dir) diff --git a/x86/BoardConfigVendor.mk b/x86/BoardConfigVendor.mk index b4d8efb..fe7a4f8 100644 --- a/x86/BoardConfigVendor.mk +++ b/x86/BoardConfigVendor.mk @@ -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 diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk index 535fb43..00b1e93 100644 --- a/x86/x86-vendor.mk +++ b/x86/x86-vendor.mk @@ -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 PRODUCT_SOONG_NAMESPACES += \