diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-02 15:53:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-02 15:53:34 +0000 |
| commit | 86baedee44a4902097310c689ee3ae7f0cdb1c8d (patch) | |
| tree | 8129d2bcf5cb8afe0b91c0e81b3250e400c18db6 /Android.mk | |
| parent | 92498d3bf3289d252195e7583f83bf8b3868aed1 (diff) | |
| parent | 010981b798fbc6b8e6a00c3ea507f00c3e77c371 (diff) | |
Merge "Use AAPT2" into oc-dev am: afa29d4a86
am: 010981b798
Change-Id: Ib3fa66f7ea415fc8263794e50d76339381480570
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index c3e065c8b..c753cfefd 100644 --- a/Android.mk +++ b/Android.mk @@ -156,14 +156,11 @@ LOCAL_RESOURCE_DIR := \ $(support_library_root_dir)/v7/cardview/res \ $(support_library_root_dir)/v7/recyclerview/res +LOCAL_USE_AAPT2 := true + # We specify each package explicitly to glob resource files. LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ - --extra-packages android.support.design \ - --extra-packages android.support.transition \ - --extra-packages android.support.v7.appcompat \ - --extra-packages android.support.v7.cardview \ - --extra-packages android.support.v7.recyclerview \ --extra-packages com.android.contacts.common \ --extra-packages com.android.dialer.app \ --extra-packages com.android.dialer.app.voicemail.error \ @@ -216,13 +213,6 @@ LOCAL_AAPT_FLAGS := \ LOCAL_STATIC_JAVA_LIBRARIES := \ android-common \ - android-support-design \ - android-support-transition \ - android-support-v13 \ - android-support-v4 \ - android-support-v7-appcompat \ - android-support-v7-cardview \ - android-support-v7-recyclerview \ com.android.vcard \ dialer-commons-io-target \ dialer-dagger2-target \ @@ -238,6 +228,15 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ libprotobuf-java-nano \ volley \ +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-design \ + android-support-transition \ + android-support-v13 \ + android-support-v4 \ + android-support-v7-appcompat \ + android-support-v7-cardview \ + android-support-v7-recyclerview \ + LOCAL_JAVA_LIBRARIES := \ org.apache.http.legacy \ dialer-auto-value \ |