summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2016-11-02 10:37:37 -0700
committerPhilip P. Moltmann <moltmann@google.com>2016-11-02 10:37:37 -0700
commit7a8edede3727c729bd5e973739fdb3d7b308e2f9 (patch)
tree6e6232ec20c4114916198877182fe11d309b59da /Android.mk
parent4e91e0324f0742203909c82c13a17641711a3acb (diff)
downloadandroid_packages_apps_PackageInstaller-7a8edede3727c729bd5e973739fdb3d7b308e2f9.tar.gz
android_packages_apps_PackageInstaller-7a8edede3727c729bd5e973739fdb3d7b308e2f9.tar.bz2
android_packages_apps_PackageInstaller-7a8edede3727c729bd5e973739fdb3d7b308e2f9.zip
Move Package installer back to AAPT2
This also fixes some issues that we cannot access the resources of the SettingsLib. Fixes: 32608113 Test: Checked that the crash of bug 32608113 does not happen anymore. Checked that we have hw accelleration even with AAPT2. Change-Id: I0e0e764ea445fcecc94d6f495fa6ad4b5e889c87
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk13
1 files changed, 1 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index 69971a20..7ed59cd3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,18 +1,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_AAPT_FLAGS := --auto-add-overlay \
- --extra-packages android.support.v17.leanback:android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview
-
-LOCAL_RESOURCE_DIR := \
- frameworks/support/v17/leanback/res \
- frameworks/support/v7/preference/res \
- frameworks/support/v14/preference/res \
- frameworks/support/v17/preference-leanback/res \
- frameworks/support/v7/appcompat/res \
- frameworks/support/v7/recyclerview/res \
- frameworks/base/packages/SettingsLib/res \
- $(LOCAL_PATH)/res
+LOCAL_USE_AAPT2 := true
LOCAL_MODULE_TAGS := optional