From 52be5fcb104cc60c34c6459e05f89a33281e80d0 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Tue, 9 Mar 2021 14:10:39 -0500 Subject: [PATCH] lineage: targets: Add support for Legacy GSIs * This is needed for VNDK27, and other older, hackier Treble implementations. * We can't include `legacy_gsi_release.mk` as it's included in the `aosp_${ARCH}_ab` targets themselves, unlike the standard `aosp_${ARCH}` targets which guard `gsi_release.mk`'s inclusion with `aosp_${ARCH}` product guards. Change-Id: I16c5983c18110b24eef84e382e0ae6852efb03c3 --- build/target/product/AndroidProducts.mk | 8 +++++++ build/target/product/lineage_arm.mk | 1 + build/target/product/lineage_arm64.mk | 1 + build/target/product/lineage_arm64_ab.mk | 21 ++++++++++++++++ build/target/product/lineage_arm_ab.mk | 21 ++++++++++++++++ .../target/product/lineage_generic_target.mk | 1 - build/target/product/lineage_x86.mk | 1 + build/target/product/lineage_x86_64.mk | 1 + build/target/product/lineage_x86_64_ab.mk | 22 +++++++++++++++++ build/target/product/lineage_x86_ab.mk | 24 +++++++++++++++++++ 10 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 build/target/product/lineage_arm64_ab.mk create mode 100644 build/target/product/lineage_arm_ab.mk create mode 100644 build/target/product/lineage_x86_64_ab.mk create mode 100644 build/target/product/lineage_x86_ab.mk diff --git a/build/target/product/AndroidProducts.mk b/build/target/product/AndroidProducts.mk index c3c1b00a..636738a2 100644 --- a/build/target/product/AndroidProducts.mk +++ b/build/target/product/AndroidProducts.mk @@ -19,6 +19,10 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/lineage_arm64.mk \ $(LOCAL_DIR)/lineage_x86.mk \ $(LOCAL_DIR)/lineage_x86_64.mk \ + $(LOCAL_DIR)/lineage_arm_ab.mk \ + $(LOCAL_DIR)/lineage_arm64_ab.mk \ + $(LOCAL_DIR)/lineage_x86_ab.mk \ + $(LOCAL_DIR)/lineage_x86_64_ab.mk \ $(LOCAL_DIR)/lineage_tv_arm.mk \ $(LOCAL_DIR)/lineage_tv_arm64.mk \ $(LOCAL_DIR)/lineage_tv_x86.mk \ @@ -29,6 +33,10 @@ COMMON_LUNCH_CHOICES := \ lineage_arm64-userdebug \ lineage_x86-userdebug \ lineage_x86_64-userdebug \ + lineage_arm_ab-userdebug \ + lineage_arm64_ab-userdebug \ + lineage_x86_ab-userdebug \ + lineage_x86_64_ab-userdebug \ lineage_tv_arm-userdebug \ lineage_tv_arm64-userdebug \ lineage_tv_x86-userdebug \ diff --git a/build/target/product/lineage_arm.mk b/build/target/product/lineage_arm.mk index 90eb1edd..2b3eb34a 100644 --- a/build/target/product/lineage_arm.mk +++ b/build/target/product/lineage_arm.mk @@ -13,6 +13,7 @@ # limitations under the License. $(call inherit-product, build/target/product/aosp_arm.mk) +$(call inherit-product, build/target/product/gsi_release.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk diff --git a/build/target/product/lineage_arm64.mk b/build/target/product/lineage_arm64.mk index e57d8fdd..e23cba6b 100644 --- a/build/target/product/lineage_arm64.mk +++ b/build/target/product/lineage_arm64.mk @@ -13,6 +13,7 @@ # limitations under the License. $(call inherit-product, build/target/product/aosp_arm64.mk) +$(call inherit-product, build/target/product/gsi_release.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk diff --git a/build/target/product/lineage_arm64_ab.mk b/build/target/product/lineage_arm64_ab.mk new file mode 100644 index 00000000..02294dd9 --- /dev/null +++ b/build/target/product/lineage_arm64_ab.mk @@ -0,0 +1,21 @@ +# Copyright (C) 2018-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. + +$(call inherit-product, build/target/product/aosp_arm64_ab.mk) + +include vendor/lineage/build/target/product/lineage_generic_target.mk + +TARGET_NO_KERNEL_OVERRIDE := true + +PRODUCT_NAME := lineage_arm64_ab diff --git a/build/target/product/lineage_arm_ab.mk b/build/target/product/lineage_arm_ab.mk new file mode 100644 index 00000000..d043a68b --- /dev/null +++ b/build/target/product/lineage_arm_ab.mk @@ -0,0 +1,21 @@ +# Copyright (C) 2018-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. + +$(call inherit-product, build/target/product/aosp_arm_ab.mk) +include vendor/lineage/build/target/product/lineage_generic_target.mk + +TARGET_NO_KERNEL_OVERRIDE := true +TARGET_USES_64_BIT_BINDER := true + +PRODUCT_NAME := lineage_arm_ab diff --git a/build/target/product/lineage_generic_target.mk b/build/target/product/lineage_generic_target.mk index e2dca796..25c5aaec 100644 --- a/build/target/product/lineage_generic_target.mk +++ b/build/target/product/lineage_generic_target.mk @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product, build/target/product/gsi_release.mk) $(call inherit-product, vendor/lineage/config/common_full_phone.mk) PRODUCT_COPY_FILES += \ diff --git a/build/target/product/lineage_x86.mk b/build/target/product/lineage_x86.mk index 85852495..bdf67c7e 100644 --- a/build/target/product/lineage_x86.mk +++ b/build/target/product/lineage_x86.mk @@ -13,6 +13,7 @@ # limitations under the License. $(call inherit-product, build/target/product/aosp_x86.mk) +$(call inherit-product, build/target/product/gsi_release.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk diff --git a/build/target/product/lineage_x86_64.mk b/build/target/product/lineage_x86_64.mk index 559bde69..ece48813 100644 --- a/build/target/product/lineage_x86_64.mk +++ b/build/target/product/lineage_x86_64.mk @@ -13,6 +13,7 @@ # limitations under the License. $(call inherit-product, build/target/product/aosp_x86_64.mk) +$(call inherit-product, build/target/product/gsi_release.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk diff --git a/build/target/product/lineage_x86_64_ab.mk b/build/target/product/lineage_x86_64_ab.mk new file mode 100644 index 00000000..9dc54f32 --- /dev/null +++ b/build/target/product/lineage_x86_64_ab.mk @@ -0,0 +1,22 @@ +# Copyright (C) 2018-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. + +$(call inherit-product, build/target/product/aosp_x86_64_ab.mk) + +include vendor/lineage/build/target/product/lineage_generic_target.mk + +PRODUCT_NAME := lineage_x86_64_ab + +PRODUCT_SDK_ADDON_NAME := lineage +PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := $(LOCAL_PATH)/source.properties diff --git a/build/target/product/lineage_x86_ab.mk b/build/target/product/lineage_x86_ab.mk new file mode 100644 index 00000000..6f1e62a2 --- /dev/null +++ b/build/target/product/lineage_x86_ab.mk @@ -0,0 +1,24 @@ +# Copyright (C) 2018-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. + +$(call inherit-product, build/target/product/aosp_x86_ab.mk) + +include vendor/lineage/build/target/product/lineage_generic_target.mk + +TARGET_USES_64_BIT_BINDER := true + +PRODUCT_NAME := lineage_x86_ab + +PRODUCT_SDK_ADDON_NAME := lineage +PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP := $(LOCAL_PATH)/source.properties