diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-02-07 15:52:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-07 15:52:30 +0000 |
| commit | 5ce9f42f5af6119b1ec2a36634b889de41f2e9f7 (patch) | |
| tree | 9f1ec48c94a99f47c01b44ab784b7726fd339fd2 /sdk/java_sdk_test.go | |
| parent | 709da2308c334a213d9fb776d03d34f5f809729a (diff) | |
| parent | fbd6af6226d639e4d27b22713ace07738fdae745 (diff) | |
Merge changes I9e94662d,I4b4e0dc8 am: 254aee4843 am: 3c4acc4279 am: fbd6af6226
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1574746
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81f78f2f4e54864be1dec87b2157f32428c54201
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 488afd84e..17a6ca9b8 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -503,7 +503,7 @@ java_import { sdk_member_name: "myjavalib", visibility: ["//visibility:public"], apex_available: ["//apex_available:platform"], - jars: ["java_boot_libs/snapshot/jars/are/invalid/myjavalib.jar"], + jars: ["java/myjavalib.jar"], } java_import { @@ -511,7 +511,7 @@ java_import { prefer: false, visibility: ["//visibility:public"], apex_available: ["//apex_available:platform"], - jars: ["java_boot_libs/snapshot/jars/are/invalid/myjavalib.jar"], + jars: ["java/myjavalib.jar"], } module_exports_snapshot { @@ -519,10 +519,9 @@ module_exports_snapshot { visibility: ["//visibility:public"], java_boot_libs: ["myexports_myjavalib@current"], } - `), checkAllCopyRules(` -.intermediates/myexports/common_os/empty -> java_boot_libs/snapshot/jars/are/invalid/myjavalib.jar +.intermediates/myjavalib/android_common/withres/myjavalib.jar -> java/myjavalib.jar `), ) } |