diff options
| author |  ajmichael <ajmichael@google.com> | 2018-02-05 08:33:22 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-05 08:35:00 -0800 |
| commit | 441dc763923a16d59b548ef7cdf97de79fd98932 (patch) | |
| tree | 68c2cddf8cc016ed45618278eb0810e3e4a3b2d1 /tools/android | |
| parent | 4741aa83145fd2d3ab0599314f7732c5b80977bd (diff) | |
Support legacy multidex.
Fix the create_main_dex_list stub script to find the dx jar binary correctly.
RELNOTES: None
PiperOrigin-RevId: 184532530
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/android_sdk_repository_template.bzl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl index 387d01457c..f9b618d1e7 100644 --- a/tools/android/android_sdk_repository_template.bzl +++ b/tools/android/android_sdk_repository_template.bzl @@ -219,8 +219,7 @@ def create_android_sdk_rules( "STRIPPED_JAR=$$2", "JAR=$$3", "" + - "DIRNAME=$$(dirname $$0)", - "JAVA_BINARY=TBD/main_dex_list_creator_java", # Proper runfiles path comes here + "JAVA_BINARY=$$0.runfiles/%s/main_dex_list_creator_java" % name, "$$JAVA_BINARY $$STRIPPED_JAR $$JAR > $$MAIN_DEX_LIST", "exit $$?", "", @@ -245,14 +244,9 @@ def create_android_sdk_rules( runtime_deps = [":dx_jar_import"], ) - native.filegroup( - name = "dx_jar", - srcs = ["build-tools/%s/lib/dx.jar" % build_tools_directory], - ) - native.java_import( name = "dx_jar_import", - jars = [":dx_jar"], + jars = ["build-tools/%s/lib/dx.jar" % build_tools_directory], ) |