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