aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzuWei Lin <szuweilin@google.com>2022-01-04 15:11:47 +0800
committerSzuWei Lin <szuweilin@google.com>2022-01-04 15:13:07 +0800
commitf1efada227bf5e2d211a8c4fb1f1928b1c3e5aeb (patch)
treee95411aef93b7d0fa397c2c9b00dbd427052d009
parent3d8ca6c8ed1eed76443bc7432b0f0280b0b9ffc9 (diff)
downloadcommon-f1efada227bf5e2d211a8c4fb1f1928b1c3e5aeb.tar.gz
Remove GKI from gsi_$arch
After having gki_$arch, there is no longer need for building GKI by target gsi_$arch. The BoardConfigGkiCommon.mk is also moved to /device/generic/common. The patch removes all GKI related settings and files from target gsi_$arch. Bug: 212486689 Test: build dist of gsi_arm64-userdebug Test: build dist of aosp_arm64-userdebug Change-Id: I698238ec582b5eabdc3635cad8585fcf16fc478f
-rw-r--r--gsi_arm64.mk5
-rw-r--r--gsi_x86_64.mk5
2 files changed, 0 insertions, 10 deletions
diff --git a/gsi_arm64.mk b/gsi_arm64.mk
index 53c8300..d792cd9 100644
--- a/gsi_arm64.mk
+++ b/gsi_arm64.mk
@@ -41,11 +41,6 @@ $(call inherit-product, device/generic/common/gsi_system_ext.mk)
$(call inherit-product, device/generic/common/gsi_product.mk)
#
-# All components inherited here go to boot image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
-
-#
# Special settings for GSI releasing
#
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk
index da7e093..eb5bd97 100644
--- a/gsi_x86_64.mk
+++ b/gsi_x86_64.mk
@@ -34,11 +34,6 @@ $(call inherit-product, device/generic/common/gsi_system_ext.mk)
$(call inherit-product, device/generic/common/gsi_product.mk)
#
-# All components inherited here go to boot image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
-
-#
# Special settings to skip mount product and system_ext on the device,
# so this product can be tested isolated from those partitions.
#