diff options
| author | Cole Faust <colefaust@google.com> | 2023-04-12 12:53:48 -0700 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2023-04-12 14:07:53 -0700 |
| commit | dbc548bd32c6f41620600df84773d8a143300e83 (patch) | |
| tree | 22896ec8ecf40ff533cb7e310e5d104bec4662f7 /rules/apex/apex_test.bzl | |
| parent | ca97f1335b31e1473b8863781451c38b5fb5bf29 (diff) | |
| download | bazel-dbc548bd32c6f41620600df84773d8a143300e83.tar.gz | |
Read Unbundled_build and Always_use_prebuilt_sdks in a transition-friendly way
Load these variables from the product_vars target instead of directly
from the soong.variables file so that it can be transitioned on.
Bug: 269577299
Test: b test --config=android //build/bazel/rules/apex/...
Change-Id: I034da70ab7ce85f467d001e842e0526bb9b99c54
Diffstat (limited to 'rules/apex/apex_test.bzl')
| -rw-r--r-- | rules/apex/apex_test.bzl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rules/apex/apex_test.bzl b/rules/apex/apex_test.bzl index 77f9d2a3..f714a599 100644 --- a/rules/apex/apex_test.bzl +++ b/rules/apex/apex_test.bzl @@ -2409,7 +2409,7 @@ def _apex_in_unbundled_build_test(ctx): apex_in_unbundled_build_test = analysistest.make( _apex_in_unbundled_build_test, config_settings = { - "@//build/bazel/rules/apex:unbundled_build": True, + "//command_line_option:platforms": "@//build/bazel/tests/products:aosp_arm64_for_testing_unbundled_build", }, ) @@ -2460,7 +2460,7 @@ def _apex_in_bundled_build_test(ctx): apex_in_bundled_build_test = analysistest.make( _apex_in_bundled_build_test, config_settings = { - "@//build/bazel/rules/apex:unbundled_build": False, + "//command_line_option:platforms": "@//build/bazel/tests/products:aosp_arm64_for_testing", }, ) @@ -2624,8 +2624,7 @@ min_target_sdk_version_api_fingerprint_test = analysistest.make( ), }, config_settings = { - "@//build/bazel/rules/apex:unbundled_build": True, - "@//build/bazel/rules/apex:always_use_prebuilt_sdks": False, + "//command_line_option:platforms": "@//build/bazel/tests/products:aosp_arm64_for_testing_unbundled_build", "@//build/bazel/rules/apex:unbundled_build_target_sdk_with_api_fingerprint": True, "@//build/bazel/rules/apex:platform_sdk_codename": "123", }, |