32e413a294
List variables needed to be percolated in the order of inherit() calls. children.keys() was in that order, due to starlark dictionaries being iterable in the order of insertion, but the previous cl broke that behavior by sorting them. Instead, only sort the children for single value variables. Fixes: 226206409 Fixes: 228044099 Test: ./out/rbcrun ./build/make/tests/run.rbc and testing aosp_arm64 Change-Id: I5b91514e87b158b615e4d4ec7868fccb0248379b
28 lines
1.2 KiB
Text
28 lines
1.2 KiB
Text
# Copyright 2022 Google LLC
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# https://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
load("//build/make/core:product_config.rbc", "rblf")
|
|
load("//build/make/tests/input_variables.rbc", input_variables_init = "init")
|
|
load(":product.rbc", "init")
|
|
|
|
|
|
def assert_eq(expected, actual):
|
|
if expected != actual:
|
|
fail("Expected '%s', got '%s'" % (expected, actual))
|
|
|
|
def test():
|
|
(globals, config, globals_base) = rblf.product_configuration("test/device", init, input_variables_init)
|
|
assert_eq("tablet", config["PRODUCT_CHARACTERISTICS"])
|
|
assert_eq("vendor/myvendor/certs/devkeys/devkey", config["PRODUCT_DEFAULT_DEV_CERTIFICATE"])
|
|
assert_eq(["foo", "bar"], config["PRODUCT_PACKAGES"])
|