From 1fb336646238647380c545805b0721ca4c32069b Mon Sep 17 00:00:00 2001 From: Yi-Yo Chiang Date: Sat, 18 Sep 2021 20:33:16 +0800 Subject: Unset PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT for gsi_car_${arch}.mk These options are only meant for the phone GSI, and causes errors here, so clear the variable value. Bug: 188067818 Test: Presubmit Change-Id: I96fe6556a3c305b80013b9523089c26ecbf9ffd8 Merged-In: I96fe6556a3c305b80013b9523089c26ecbf9ffd8 (cherry picked from commit 9170a9457953a30657c66b5368d8d600055cf190) --- gsi_car_arm64.mk | 4 ++++ gsi_car_x86_64.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gsi_car_arm64.mk b/gsi_car_arm64.mk index 0977da4..fcda6b2 100644 --- a/gsi_car_arm64.mk +++ b/gsi_car_arm64.mk @@ -16,6 +16,10 @@ $(call inherit-product, device/generic/car/gsi_car_base.mk) $(call inherit-product, device/generic/common/gsi_arm64.mk) +# This option is specific to the phone GSI, so clear this option after +# gsi_arm64.mk is inherited. +PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT := + PRODUCT_NAME := gsi_car_arm64 PRODUCT_DEVICE := generic_arm64 PRODUCT_BRAND := Android diff --git a/gsi_car_x86_64.mk b/gsi_car_x86_64.mk index 378fa5c..519deef 100644 --- a/gsi_car_x86_64.mk +++ b/gsi_car_x86_64.mk @@ -16,6 +16,10 @@ $(call inherit-product, device/generic/car/gsi_car_base.mk) $(call inherit-product, device/generic/common/gsi_x86_64.mk) +# This option is specific to the phone GSI, so clear this option after +# gsi_x86_64.mk is inherited. +PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT := + PRODUCT_NAME := gsi_car_x86_64 PRODUCT_DEVICE := generic_x86_64 PRODUCT_BRAND := Android -- cgit v1.2.3