Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 860f42c1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Most of the TARGET_COPY_OUT_xxx variables are not constant"

parents 37abc3c3 02183cfc

mk2rbc/mk2rbc.go

+0 −7
Original line number Diff line number Diff line
@@ -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

mk2rbc/mk2rbc_test.go

+2 −2
Original line number Diff line number Diff line
@@ -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")

`,