diff options
| author |  asteinb <asteinb@google.com> | 2018-08-09 07:04:24 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-09 07:06:28 -0700 |
| commit | f28626035176d8934d741e23defb0569c6064081 (patch) | |
| tree | e494bdb309765d56dbeafa98704f1c9710b8cab4 /src/main/java/com/google/devtools/build/lib/skylarkbuildapi | |
| parent | 6620107fb57598450d2cb7327f6b82c0a6e9afc3 (diff) | |
Final asset/resource decoupling cleanup
- Remove MergableAndroidData interface, and clean up various converters to
explicitly use ParsedAndroid{Resources|Assets}
- Remove calls to getters that always return an empty list (based on the above
cleanup)
- Stop passing around empty transitiveAssets in ResourceDependencies and
AndroidResourcesInfo
- Remove no-op getter method for decoupling settings in AndroidConfiguration
Also, consolidate all AndroidDataConverter instances that were used in multiple
places into the AndroidDataConverter class, rather than declaring them in
multiple places. Add a bit of documentation as to which objects they represent
in the action code, which should make mapping between one and the other easier.
RELNOTES: none
PiperOrigin-RevId: 208042452
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skylarkbuildapi')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java index a723c7f467..ea0705a15f 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java @@ -157,13 +157,6 @@ public interface AndroidResourcesInfoApi< type = SkylarkNestedSet.class, generic1 = FileApi.class), @Param( - name = "transitive_assets", - doc = "A depset of Artifacts of Android Assets in the transitive closure.", - positional = true, - named = false, - type = SkylarkNestedSet.class, - generic1 = FileApi.class), - @Param( name = "transitive_manifests", doc = "A depset of Artifacts of Android Manifests in the transitive closure.", positional = true, @@ -217,7 +210,6 @@ public interface AndroidResourcesInfoApi< SkylarkNestedSet transitiveAndroidResources, SkylarkNestedSet directAndroidResources, SkylarkNestedSet transitiveResources, - SkylarkNestedSet transitiveAssets, SkylarkNestedSet transitiveManifests, SkylarkNestedSet transitiveAapt2RTxt, SkylarkNestedSet transitiveSymbolsBin, |