Merge "Build against the JB SDK" into jb-ub-mail

This commit is contained in:
Paul Westbrook 2012-05-17 17:09:07 -07:00 committed by Android (Google) Code Review
commit 671965f494
2 changed files with 4 additions and 1 deletions

View File

@ -49,7 +49,7 @@ LOCAL_OVERRIDES_PACKAGES := Email
LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags
LOCAL_SDK_VERSION := 14
LOCAL_SDK_VERSION := 16
include $(BUILD_PACKAGE)

View File

@ -37,6 +37,9 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<!-- This needs to be present when we are doing unbundled releases. -->
<uses-sdk android:targetSdkVersion="16" android:minSdkVersion="14" />
<!-- Grant permission to other apps to view attachments -->
<permission
android:name="com.android.email.permission.READ_ATTACHMENT"