Skip to content

Commit

Permalink
Revert D69821223: Reland "[buck2][apk_genrule] Passthrough native_lib…
Browse files Browse the repository at this point in the history
…s to aab apk_genrule"

Differential Revision:
D69821223

Original commit changeset: 4a6ae4f6dba7

Original Phabricator Diff: D69821223

fbshipit-source-id: e3d8ba110402c98e17e560cdd74f3443e1a2ce23
  • Loading branch information
jiawei-lyu authored and facebook-github-bot committed Feb 20, 2025
1 parent b2a4680 commit 3ec60c2
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions prelude/android/apk_genrule.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ def apk_genrule_impl(ctx: AnalysisContext) -> list[Provider]:
input_android_apk_under_test_info = None
input_unstripped_shared_libraries = None
input_android_apk_subtargets = None
input_android_aab_subtargets = None
if ctx.attrs.apk != None:
# TODO(T104150125) The underlying APK should not have exopackage enabled
input_android_apk_info = ctx.attrs.apk[AndroidApkInfo]
Expand All @@ -43,7 +42,6 @@ def apk_genrule_impl(ctx: AnalysisContext) -> list[Provider]:
input_apk = input_android_aab_info.aab
input_manifest = input_android_aab_info.manifest
input_materialized_artifacts = input_android_aab_info.materialized_artifacts
input_android_aab_subtargets = ctx.attrs.aab[DefaultInfo].sub_targets

env_vars = {
"AAB": cmd_args(input_apk),
Expand Down Expand Up @@ -98,20 +96,11 @@ def apk_genrule_impl(ctx: AnalysisContext) -> list[Provider]:
"aab": [DefaultInfo(
default_outputs = [genrule_default_output],
)],
"native_libs": [input_android_aab_subtargets["native_libs"][DefaultInfo]],
},
),
] + filter(lambda x: not isinstance(x, DefaultInfo), genrule_providers)
else:
default_providers = [
DefaultInfo(
default_output = genrule_default_output,
other_outputs = genrule_default_info[0].other_outputs,
sub_targets = {
"native_libs": [input_android_aab_subtargets["native_libs"][DefaultInfo]],
},
),
] + filter(lambda x: not isinstance(x, DefaultInfo), genrule_providers)
default_providers = genrule_providers

else:
sub_targets = {k: [v[DefaultInfo]] for k, v in genrule_default_info[0].sub_targets.items()}
Expand Down

0 comments on commit 3ec60c2

Please sign in to comment.