diff options
| author | Liz Kammer <eakammer@google.com> | 2023-08-30 20:14:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-30 20:14:24 +0000 |
| commit | e2693353970b945c6a0343656196d468611995a8 (patch) | |
| tree | c055a745dfcc4ad0a48ffbcf848ffeea2c5bc282 | |
| parent | 449f368b4a1ebaf6daaeee6449af3b2ed0253996 (diff) | |
| parent | c1b382adf9f9a0875757677767f38ef7111c5ddd (diff) | |
| download | xsdc-e2693353970b945c6a0343656196d468611995a8.tar.gz | |
Set sdk_version in tests am: 1d100f64eb am: 3ad6d0da25 am: 6b4b2bc4a9 am: 5dea6be38e am: c1b382adf9
Original change: https://android-review.googlesource.com/c/platform/system/tools/xsdc/+/2698153
Change-Id: I85abae5de5c59744c8dd288797a6c8d94a33b2bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | build/xsdc_bp2build_conversion_test.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/build/xsdc_bp2build_conversion_test.go b/build/xsdc_bp2build_conversion_test.go index 1d2be58..977f4be 100644 --- a/build/xsdc_bp2build_conversion_test.go +++ b/build/xsdc_bp2build_conversion_test.go @@ -41,10 +41,12 @@ const ( java_preamble = ` java_library { name: "stub-annotations", + sdk_version: "current", bazel_module: {bp2build_available: false}, } java_library { name: "kxml2-2.3.0", + sdk_version: "current", host_supported: true, bazel_module: {bp2build_available: false}, } @@ -167,6 +169,7 @@ java_library { "A.java", ":foo" ], + sdk_version: "current", }`, ExpectedBazelTargets: []string{ bp2build.MakeBazelTarget("cc_library_static", "cclib_bp2build_cc_library_static", bp2build.AttrNameToString{ @@ -178,11 +181,12 @@ java_library { "implementation_whole_archive_deps": `[":foo-cpp"]`, }), bp2build.MakeBazelTarget("java_library", "javalib", bp2build.AttrNameToString{ - "srcs": `["A.java"]`, - "deps": `[":foo-java"]`, - "exports": `[":foo-java"]`, + "srcs": `["A.java"]`, + "deps": `[":foo-java"]`, + "exports": `[":foo-java"]`, + "sdk_version": `"current"`, }), - bp2build.MakeNeverlinkDuplicateTargetWithAttrs("java_library", "javalib", bp2build.AttrNameToString{}), + bp2build.MakeNeverlinkDuplicateTarget("java_library", "javalib"), }, }) } |