Skip to content

Commit 92bf6f4

Browse files
ted-xiecopybara-github
authored andcommitted
Add -desugared_lib_config to mobile-install dex/desugar
PiperOrigin-RevId: 736855556 Change-Id: I3ee65bebdd9ceeeaecb6f9a105d75aaf6955a119
1 parent 6d85a0c commit 92bf6f4

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

mobile_install/tools_common.bzl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ TOOL_ATTRS = dict(
7272
cfg = "exec",
7373
executable = True,
7474
),
75+
_desugared_lib_config = attr.label(
76+
allow_single_file = True,
77+
default = Label("//tools/android:full_desugar_jdk_libs_config_json"),
78+
),
7579
_dexmerger = attr.label(
7680
cfg = "exec",
7781
default = Label("//tools/android:dexmerger"),

mobile_install/utils.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ def dex(ctx, jar, out_dex_shards, deps = None, desugar = True):
167167
if deps:
168168
args.add_joined("-classpath", deps, join_with = ",")
169169
args.add("-desugar_core_libs", "True")
170+
args.add("-desugared_lib_config", ctx.file._desugared_lib_config)
171+
170172
args.add("-dexbuilder", ctx.executable._dexbuilder)
171173
args.add("-min_sdk_version", min_sdk)
172174
args.add("-in", jar)
@@ -177,7 +179,7 @@ def dex(ctx, jar, out_dex_shards, deps = None, desugar = True):
177179
arguments = ["dex", args],
178180
tools = [ctx.executable._desugar_java8, ctx.executable._dexbuilder],
179181
inputs = depset(
180-
ctx.files._android_sdk + [jar],
182+
ctx.files._android_sdk + [jar, ctx.file._desugared_lib_config],
181183
transitive = [deps] if deps else [],
182184
),
183185
outputs = out_dex_shards,

rules/min_sdk_version.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def _get(ctx):
5454
# if not ctx.attr._min_sdk_version[BuildSettingInfo].value:
5555
# return _DEPOT_FLOOR
5656
# return ctx.attr._min_sdk_version[BuildSettingInfo].value
57-
return 0
57+
return _DEPOT_FLOOR
5858

5959
min_sdk_version = struct(
6060
attrs = _ATTRS,

0 commit comments

Comments
 (0)