Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c86992e0 authored by Tom Pratt's avatar Tom Pratt Committed by Bruno Martins
Browse files

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
parent 4fef4114

build/target/product/AndroidProducts.mk

+8 −8
Original line number Diff line number Diff line
@@ -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 \

build/target/product/lineage_arm64.mk→build/target/product/lineage_gsi_arm.mk

+4 −6
Original line number Diff line number Diff line
@@ -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



TARGET_NO_KERNEL_OVERRIDE := true

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



# Enable mainline checking

PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed

TARGET_NO_KERNEL_OVERRIDE := true



PRODUCT_NAME := lineage_arm64
 
PRODUCT_NAME := lineage_gsi_arm

build/target/product/lineage_arm.mk→build/target/product/lineage_gsi_arm64.mk

+4 −7
Original line number Diff line number Diff line
@@ -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



TARGET_NO_KERNEL_OVERRIDE := true

TARGET_USES_64_BIT_BINDER := true

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



# Enable mainline checking

PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed

TARGET_NO_KERNEL_OVERRIDE := true



PRODUCT_NAME := lineage_arm
 
PRODUCT_NAME := lineage_gsi_arm64

build/target/product/lineage_x86_64.mk→build/target/product/lineage_gsi_x86.mk

+4 −6
Original line number Diff line number Diff line
@@ -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



TARGET_NO_KERNEL_OVERRIDE := true

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



# Enable mainline checking

PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed

TARGET_NO_KERNEL_OVERRIDE := true



PRODUCT_NAME := lineage_x86_64
 
PRODUCT_NAME := lineage_gsi_x86

build/target/product/lineage_x86.mk→build/target/product/lineage_gsi_x86_64.mk

+4 −7
Original line number Diff line number Diff line
@@ -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

TARGET_NO_KERNEL_OVERRIDE := true

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



# Enable mainline checking

PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed

TARGET_NO_KERNEL_OVERRIDE := true



PRODUCT_NAME := lineage_x86
 
PRODUCT_NAME := lineage_gsi_x86_64