diff options
| author |  Googler <noreply@google.com> | 2015-06-15 20:32:59 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2015-06-16 13:59:02 +0000 |
| commit | 1e833fea44f394e70d33465e74e1c4a8b4909a0c (patch) | |
| tree | 3e8dccdfb5a10be3a0829e0cfd999524c0898abd /src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | |
| parent | 80bac08fa0e1c0292b26044322a0ef5ece3b59ae (diff) | |
Adds a new input and output to resource processing, symbols txt, which will be used to express the direct dependencies for resource processing.
--
MOS_MIGRATED_REVID=96037997
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index 194c9245b2..dd650e04a6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -176,14 +176,14 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { resourceContainers, tools, null, /* Artifact rTxt */ + null, /* Artifact symbolsTxt */ ruleContext.getTokenizedStringListAttr("resource_configuration_filters"), ruleContext.getTokenizedStringListAttr("nocompress_extensions"), ruleContext.getTokenizedStringListAttr("densities"), ruleContext.attributes().get("application_id", Type.STRING), getExpandedMakeVarsForAttr(ruleContext, "version_code"), getExpandedMakeVarsForAttr(ruleContext, "version_name"), - false, - getProguardConfigArtifact(ruleContext, "")); + false, getProguardConfigArtifact(ruleContext, "")); incrementalResourceApk = applicationManifest.addStubApplication(ruleContext) .packWithDataAndResources(ruleContext .getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_INCREMENTAL_RESOURCES_APK), @@ -191,14 +191,14 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { resourceContainers, tools, null, /* Artifact rTxt */ + null, /* Artifact symbolsTxt */ ruleContext.getTokenizedStringListAttr("resource_configuration_filters"), ruleContext.getTokenizedStringListAttr("nocompress_extensions"), ruleContext.getTokenizedStringListAttr("densities"), ruleContext.attributes().get("application_id", Type.STRING), getExpandedMakeVarsForAttr(ruleContext, "version_code"), getExpandedMakeVarsForAttr(ruleContext, "version_name"), - true, - getProguardConfigArtifact(ruleContext, "incremental")); + true, getProguardConfigArtifact(ruleContext, "incremental")); splitResourceApk = applicationManifest .createSplitManifest(ruleContext, "android_resources", false) .packWithDataAndResources(getDxArtifact(ruleContext, "android_resources.ap_"), @@ -206,14 +206,14 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { resourceContainers, tools, null, /* Artifact rTxt */ + null, /* Artifact symbolsTxt */ ruleContext.getTokenizedStringListAttr("resource_configuration_filters"), ruleContext.getTokenizedStringListAttr("nocompress_extensions"), ruleContext.getTokenizedStringListAttr("densities"), ruleContext.attributes().get("application_id", Type.STRING), getExpandedMakeVarsForAttr(ruleContext, "version_code"), getExpandedMakeVarsForAttr(ruleContext, "version_name"), - true, - getProguardConfigArtifact(ruleContext, "incremental_split")); + true, getProguardConfigArtifact(ruleContext, "incremental_split")); } else { // Retrieve the resources from the resources attribute on the android_binary rule // and recompile them if necessary. |