| commit | 06aae17dfbe146af6ebab94e1c5e9a6aac6b0d01 | [log] [tgz] |
|---|---|---|
| author | Paul Westbrook <pwestbro@google.com> | Tue Oct 18 17:27:38 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 18 17:27:38 2011 -0700 |
| tree | 6d72b1d99f3d8a44c5f316fc1c66a1f561c640cf | |
| parent | 470ed3c4f37e829771054ab6e3d61431d1de7640 [diff] | |
| parent | 1aa2a0fce6c8cf9ceffafae748a67ebfc4dcee66 [diff] |
Merge "Fix build"
diff --git a/Android.mk b/Android.mk index 81c2bbe9..ce837b1 100644 --- a/Android.mk +++ b/Android.mk
@@ -28,6 +28,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/email) LOCAL_SRC_FILES += $(call all-java-files-under, src/com/beetstra) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir)) +LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava android-common-chips