From c86992e0cd80ea4790d37dd74c3a917efc310660 Mon Sep 17 00:00:00 2001 From: Tom Pratt Date: Thu, 3 Mar 2022 10:54:03 +0100 Subject: [PATCH] Fix GSI targets Inherit from AOSP gsi_{arch}.mk, because aosp_{arch}.mk files are obsolete in Android 12. Rename for consistency with AOSP gsi/sdk targets. Change-Id: I449390521307ff4f269a9ebf1ad3a5ffc398bc97 --- build/target/product/AndroidProducts.mk | 16 ++++++++-------- .../{lineage_arm64.mk => lineage_gsi_arm.mk} | 10 ++++------ .../{lineage_arm.mk => lineage_gsi_arm64.mk} | 11 ++++------- .../{lineage_x86_64.mk => lineage_gsi_x86.mk} | 10 ++++------ .../{lineage_x86.mk => lineage_gsi_x86_64.mk} | 11 ++++------- 5 files changed, 24 insertions(+), 34 deletions(-) rename build/target/product/{lineage_arm64.mk => lineage_gsi_arm.mk} (75%) rename build/target/product/{lineage_arm.mk => lineage_gsi_arm64.mk} (72%) rename build/target/product/{lineage_x86_64.mk => lineage_gsi_x86.mk} (75%) rename build/target/product/{lineage_x86.mk => lineage_gsi_x86_64.mk} (72%) diff --git a/build/target/product/AndroidProducts.mk b/build/target/product/AndroidProducts.mk index 01bd9288..53af3870 100644 --- a/build/target/product/AndroidProducts.mk +++ b/build/target/product/AndroidProducts.mk @@ -15,10 +15,10 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_arm.mk \ - $(LOCAL_DIR)/lineage_arm64.mk \ - $(LOCAL_DIR)/lineage_x86.mk \ - $(LOCAL_DIR)/lineage_x86_64.mk \ + $(LOCAL_DIR)/lineage_gsi_arm.mk \ + $(LOCAL_DIR)/lineage_gsi_arm64.mk \ + $(LOCAL_DIR)/lineage_gsi_x86.mk \ + $(LOCAL_DIR)/lineage_gsi_x86_64.mk \ $(LOCAL_DIR)/lineage_tv_arm.mk \ $(LOCAL_DIR)/lineage_tv_arm64.mk \ $(LOCAL_DIR)/lineage_tv_x86.mk \ @@ -31,10 +31,10 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/lineage_sdk_tv_x86.mk COMMON_LUNCH_CHOICES := \ - lineage_arm-userdebug \ - lineage_arm64-userdebug \ - lineage_x86-userdebug \ - lineage_x86_64-userdebug \ + lineage_gsi_arm-userdebug \ + lineage_gsi_arm64-userdebug \ + lineage_gsi_x86-userdebug \ + lineage_gsi_x86_64-userdebug \ lineage_tv_arm-userdebug \ lineage_tv_arm64-userdebug \ lineage_tv_x86-userdebug \ diff --git a/build/target/product/lineage_arm64.mk b/build/target/product/lineage_gsi_arm.mk similarity index 75% rename from build/target/product/lineage_arm64.mk rename to build/target/product/lineage_gsi_arm.mk index 24aeb49e..df7e7b30 100644 --- a/build/target/product/lineage_arm64.mk +++ b/build/target/product/lineage_gsi_arm.mk @@ -12,14 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product, build/target/product/aosp_arm64.mk) -$(call inherit-product, build/target/product/gsi_release.mk) +$(call inherit-product, device/generic/common/gsi_arm.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk +PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true + TARGET_NO_KERNEL_OVERRIDE := true -# Enable mainline checking -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed - -PRODUCT_NAME := lineage_arm64 +PRODUCT_NAME := lineage_gsi_arm diff --git a/build/target/product/lineage_arm.mk b/build/target/product/lineage_gsi_arm64.mk similarity index 72% rename from build/target/product/lineage_arm.mk rename to build/target/product/lineage_gsi_arm64.mk index 335e12c3..1cf5ee93 100644 --- a/build/target/product/lineage_arm.mk +++ b/build/target/product/lineage_gsi_arm64.mk @@ -12,15 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product, build/target/product/aosp_arm.mk) -$(call inherit-product, build/target/product/gsi_release.mk) +$(call inherit-product, device/generic/common/gsi_arm64.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk +PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true + TARGET_NO_KERNEL_OVERRIDE := true -TARGET_USES_64_BIT_BINDER := true -# Enable mainline checking -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed - -PRODUCT_NAME := lineage_arm +PRODUCT_NAME := lineage_gsi_arm64 diff --git a/build/target/product/lineage_x86_64.mk b/build/target/product/lineage_gsi_x86.mk similarity index 75% rename from build/target/product/lineage_x86_64.mk rename to build/target/product/lineage_gsi_x86.mk index 607bb5a8..91637ff7 100644 --- a/build/target/product/lineage_x86_64.mk +++ b/build/target/product/lineage_gsi_x86.mk @@ -12,14 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product, build/target/product/aosp_x86_64.mk) -$(call inherit-product, build/target/product/gsi_release.mk) +$(call inherit-product, device/generic/common/gsi_x86.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk +PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true + TARGET_NO_KERNEL_OVERRIDE := true -# Enable mainline checking -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed - -PRODUCT_NAME := lineage_x86_64 +PRODUCT_NAME := lineage_gsi_x86 diff --git a/build/target/product/lineage_x86.mk b/build/target/product/lineage_gsi_x86_64.mk similarity index 72% rename from build/target/product/lineage_x86.mk rename to build/target/product/lineage_gsi_x86_64.mk index c402db4b..4c99bfb2 100644 --- a/build/target/product/lineage_x86.mk +++ b/build/target/product/lineage_gsi_x86_64.mk @@ -12,15 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product, build/target/product/aosp_x86.mk) -$(call inherit-product, build/target/product/gsi_release.mk) +$(call inherit-product, device/generic/common/gsi_x86_64.mk) include vendor/lineage/build/target/product/lineage_generic_target.mk -TARGET_USES_64_BIT_BINDER := true +PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true + TARGET_NO_KERNEL_OVERRIDE := true -# Enable mainline checking -PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed - -PRODUCT_NAME := lineage_x86 +PRODUCT_NAME := lineage_gsi_x86_64