From 9d77b411ec5c36ffa94b5ee5d2eaec60494453fb Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Wed, 30 Nov 2016 03:54:55 +0000
Subject: [PATCH] Revert AppCompat's use of VDC

It causes too many problems from a build perspective
for now. External developers can still use <vector>
drawables through AppCompat, it's just that the library
does not use them itself, and therefore force developers
to update their build config.

BUG: 27453786

Change-Id: Ie4ed9d213d9dcbcce622fe82c92808da19a78ed0

GitOrigin-RevId=000c3b61b4f8a8e96060aeef662eb728101b83b9

PiperOrigin-RevId: 140560162
---
 Android.mk   | 3 +--
 build.gradle | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index c4004f51a..6a10438b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,8 +28,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
     --extra-packages android.support.v7.appcompat \
-    --extra-packages android.support.v7.recyclerview \
-    --no-version-vectors
+    --extra-packages android.support.v7.recyclerview
 LOCAL_JAR_EXCLUDE_FILES := none
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/build.gradle b/build.gradle
index 7148e50f5..eb880a1f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,8 +25,6 @@ android {
     defaultConfig {
         minSdkVersion 7
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        // This disables the builds tools automatic vector -> PNG generation
-        generatedDensities = []
     }
 
     sourceSets {
@@ -55,10 +53,6 @@ android {
     buildTypes.all {
         consumerProguardFiles 'proguard-rules.pro'
     }
-
-    aaptOptions {
-        additionalParameters "--no-version-vectors"
-    }
 }
 
 android.libraryVariants.all { variant ->