From 02183cfc53eccbbede8a14776829fb091e06d4d8 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Mon, 16 Aug 2021 13:36:11 -0700 Subject: [PATCH] Most of the TARGET_COPY_OUT_xxx variables are not constant Bug: 193566316 Test: internal Change-Id: I484a88de933904a2ac2e36084509838d7a85262c --- mk2rbc/mk2rbc.go | 7 ------- mk2rbc/mk2rbc_test.go | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/mk2rbc/mk2rbc.go b/mk2rbc/mk2rbc.go index 7ceac41b5..30888c763 100644 --- a/mk2rbc/mk2rbc.go +++ b/mk2rbc/mk2rbc.go @@ -419,14 +419,7 @@ func newParseContext(ss *StarlarkScript, nodes []mkparser.Node) *parseContext { {"TARGET_COPY_OUT_TEST_HARNESS_RAMDISK", "test_harness_ramdisk"}, {"TARGET_COPY_OUT_ROOT", "root"}, {"TARGET_COPY_OUT_RECOVERY", "recovery"}, - {"TARGET_COPY_OUT_VENDOR", "||VENDOR-PATH-PH||"}, {"TARGET_COPY_OUT_VENDOR_RAMDISK", "vendor_ramdisk"}, - {"TARGET_COPY_OUT_PRODUCT", "||PRODUCT-PATH-PH||"}, - {"TARGET_COPY_OUT_PRODUCT_SERVICES", "||PRODUCT-PATH-PH||"}, - {"TARGET_COPY_OUT_SYSTEM_EXT", "||SYSTEM_EXT-PATH-PH||"}, - {"TARGET_COPY_OUT_ODM", "||ODM-PATH-PH||"}, - {"TARGET_COPY_OUT_VENDOR_DLKM", "||VENDOR_DLKM-PATH-PH||"}, - {"TARGET_COPY_OUT_ODM_DLKM", "||ODM_DLKM-PATH-PH||"}, // TODO(asmundak): to process internal config files, we need the following variables: // BOARD_CONFIG_VENDOR_PATH // TARGET_VENDOR diff --git a/mk2rbc/mk2rbc_test.go b/mk2rbc/mk2rbc_test.go index a14c7a4f9..ebaae282b 100644 --- a/mk2rbc/mk2rbc_test.go +++ b/mk2rbc/mk2rbc_test.go @@ -259,7 +259,7 @@ def init(g, handle): ifdef PRODUCT_NAME # Comment else - TARGET_COPY_OUT_VENDOR := foo + TARGET_COPY_OUT_RECOVERY := foo endif `, expected: `load("//build/make/core:product_config.rbc", "rblf") @@ -270,7 +270,7 @@ def init(g, handle): # Comment pass else: - # MK2RBC TRANSLATION ERROR: cannot set predefined variable TARGET_COPY_OUT_VENDOR to "foo", its value should be "||VENDOR-PATH-PH||" + # MK2RBC TRANSLATION ERROR: cannot set predefined variable TARGET_COPY_OUT_RECOVERY to "foo", its value should be "recovery" pass rblf.warning("product.mk", "partially successful conversion") `,