Merge "Build against the JB SDK" into jb-ub-mail
This commit is contained in:
commit
671965f494
@ -49,7 +49,7 @@ LOCAL_OVERRIDES_PACKAGES := Email
|
|||||||
|
|
||||||
LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags
|
LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags
|
||||||
|
|
||||||
LOCAL_SDK_VERSION := 14
|
LOCAL_SDK_VERSION := 16
|
||||||
|
|
||||||
include $(BUILD_PACKAGE)
|
include $(BUILD_PACKAGE)
|
||||||
|
|
||||||
|
@ -37,6 +37,9 @@
|
|||||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
|
<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 -->
|
<!-- Grant permission to other apps to view attachments -->
|
||||||
<permission
|
<permission
|
||||||
android:name="com.android.email.permission.READ_ATTACHMENT"
|
android:name="com.android.email.permission.READ_ATTACHMENT"
|
||||||
|
Loading…
Reference in New Issue
Block a user