diff options
| author | thaidn <thaidn@google.com> | 2020-10-08 13:20:24 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2020-10-08 13:20:57 -0700 |
| commit | 9e98747cd4bfbcc9d84af6e7ca23ca29764c6463 (patch) | |
| tree | cacae1d8a77526fdc56cbc6e8fec4ec3631333b8 /java_src/tools | |
| parent | 393620f912a784e979d2211a7056a60a6ae7dc73 (diff) | |
| download | tink-9e98747cd4bfbcc9d84af6e7ca23ca29764c6463.tar.gz | |
Internal change
PiperOrigin-RevId: 336151444
Diffstat (limited to 'java_src/tools')
| -rw-r--r-- | java_src/tools/build_defs/tink_java_rules.bzl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java_src/tools/build_defs/tink_java_rules.bzl b/java_src/tools/build_defs/tink_java_rules.bzl index e1606e6dc..8bc0db1fb 100644 --- a/java_src/tools/build_defs/tink_java_rules.bzl +++ b/java_src/tools/build_defs/tink_java_rules.bzl @@ -53,9 +53,10 @@ def collect_android_libraries_and_make_test_suite(name, shard_count = 1): # Some tests require --config=android_java8_libs which in turn requires enabling multidex. # See go/java8-libs-for-android-faq for details. - multidex = "legacy" - if version_num >= 21: - multidex = "native" + multidex = "native" + if version_num < 21: + multidex = "legacy" + dependencies["//third_party/java/android/android_sdk_linux/extras/android/compatibility/multidex"] = True android_binary( name = binary_name, deps = list(dependencies), |