aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Andrew Pellegrini <apell@google.com>2015-10-26 19:17:46 +0000
committerGravatar Florian Weikert <fwe@google.com>2015-10-27 11:49:17 +0000
commit5aafbdd70b2b3d3a83cc5fead6af19a496c5995d (patch)
treec7a5e41443db66255f0b8881a356ebef9abe3db7 /src
parent99e519d01734cfcd718fe776baa2fc94e26ed66c (diff)
Update android screen densities to include 420 dpi added for the Nexus 5X. Adds documentation about the associated manifest processing to add a compatible-screens section.
RELNOTES: 420 dpi is now a valid density for andoid_binary.densities. -- MOS_MIGRATED_REVID=106324044
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java4
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java
index 06a706d698..914fefd76c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinaryOnlyRule.java
@@ -85,7 +85,9 @@ public final class AndroidBinaryOnlyRule implements RuleDefinition {
Densities to filter for when building the apk.
${SYNOPSIS}
This will strip out raster drawable resources that would not be loaded by a device with
- the specified screen densities, to reduce APK size.
+ the specified screen densities, to reduce APK size. A corresponding compatible-screens
+ section will also be added to the manifest if it does not already contain a superset
+ listing.
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(attr("densities", STRING_LIST))
.add(attr("$android_manifest_merge_tool", LABEL)
diff --git a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java
index 8536113495..32e2d07efc 100644
--- a/src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java
+++ b/src/tools/android/java/com/google/devtools/build/android/DensitySpecificManifestProcessor.java
@@ -56,6 +56,7 @@ public class DensitySpecificManifestProcessor {
.put("hdpi", "hdpi")
.put("xhdpi", "xhdpi")
.put("400dpi", "400")
+ .put("420dpi", "420")
.put("xxhdpi", "480")
.put("560dpi", "560")
.put("xxxhdpi", "640").build();