aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-03-16 08:07:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-16 08:07:52 +0000
commit0efdd62d95d0f843e620a3b6cbf7cd25ed8bbe4d (patch)
treea08cb5f703db09a82d3b297def58361464b63c1f
parent651889db878c8fdc02c1c9facb6a81b6bbe3ad8d (diff)
parent5bca6ff26cd55a8acd6131962d3370678bbbfdb0 (diff)
downloadcommon-0efdd62d95d0f843e620a3b6cbf7cd25ed8bbe4d.tar.gz
Merge "Remove GKI from gsi_$arch" am: ed4305638b am: 5bca6ff26c
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1936179 Change-Id: Ib23fa4fb0d847637d13fbb2e47935ca91e233d08
-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.
#