Change Email2's build
Now Email2 is not being built as an override package, and
the package is not being renamed
Change-Id: I2f7b08165cef19c24084942f4ee11c8d401a2ca8
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 801b20a..f9a9ad3 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -59,6 +59,7 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/EmailGoogle_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email2_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/email2/Android.mk b/email2/Android.mk
index e7fd1cb..fb0cabc 100644
--- a/email2/Android.mk
+++ b/email2/Android.mk
@@ -35,13 +35,10 @@
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
- --rename-manifest-package com.android.email2 \
- --extra-packages com.android.ex.chips
+ --extra-packages com.android.ex.chips:com.android.mail
LOCAL_PACKAGE_NAME := Email2
-LOCAL_OVERRIDES_PACKAGES := UnifiedEmail
-
LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags
include $(BUILD_PACKAGE)
diff --git a/email2/AndroidManifest.xml b/email2/AndroidManifest.xml
index 297848b..d0e65b7 100644
--- a/email2/AndroidManifest.xml
+++ b/email2/AndroidManifest.xml
@@ -15,13 +15,10 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.mail"
+ package="com.android.email2"
android:versionCode="1"
android:versionName="1.0" >
- <original-package android:name="com.android.mail" />
-
-
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<!-- Allows mail to access the user's contacts, for email address auto-completion -->
<uses-permission android:name="android.permission.READ_CONTACTS"/>
@@ -41,7 +38,7 @@
<meta-data android:name="android.app.default_searchable"
android:value="com.android.email2.ui.MailActivityEmail" />
<activity
- android:name=".compose.ComposeActivity"
+ android:name="com.android.mail.compose.ComposeActivity"
android:label="@string/app_name"
android:theme="@android:style/Theme.Holo.Light"
>
@@ -91,10 +88,11 @@
</intent-filter>
</activity>
+ <!-- TODO: this activity doesn't exist. Determine what to do here -->
<activity android:name=".ui.CreateShortcutActivity"
android:label="@string/activity_folder_selection" />
- <activity android:name=".ui.FolderSelectionActivity"
+ <activity android:name="com.android.mail.ui.FolderSelectionActivity"
android:label="@string/activity_folder_selection" />
<activity android:name="com.android.email2.ui.MailboxSelectionActivityEmail"
@@ -129,7 +127,7 @@
android:authorities="com.android.email2.conversation.provider"
android:label="@string/conversation_content_provider"
android:multiprocess="false"
- android:name=".browse.EmailConversationProvider" >
+ android:name="com.android.mail.browse.EmailConversationProvider" >
<grant-uri-permission android:pathPattern=".*" />
</provider>
@@ -137,19 +135,19 @@
android:authorities="com.android.email2.accountcache"
android:label="@string/account_cache_provider"
android:multiprocess="false"
- android:name=".providers.EmailAccountCacheProvider" >
+ android:name="com.android.mail.providers.EmailAccountCacheProvider" >
<grant-uri-permission android:pathPattern=".*" />
</provider>
- <receiver android:name=".providers.protos.boot.AccountReceiver">
+ <receiver android:name="com.android.mail.providers.protos.boot.AccountReceiver">
<intent-filter>
<action android:name="com.android.email2.providers.protos.boot.intent.ACTION_PROVIDER_CREATED" />
</intent-filter>
</receiver>
- <service android:name=".compose.EmptyService"/>
+ <service android:name="com.android.mail.compose.EmptyService"/>
<!-- Widget -->
- <receiver android:name=".widget.WidgetProvider" android:label="@string/app_name">
+ <receiver android:name="com.android.mail.widget.WidgetProvider" android:label="@string/app_name">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
@@ -159,7 +157,7 @@
<meta-data android:name="android.appwidget.provider"
android:resource="@xml/widget_info" />
</receiver>
- <service android:name=".widget.WidgetService"
+ <service android:name="com.android.mail.widget.WidgetService"
android:permission="android.permission.BIND_REMOTEVIEWS"
android:exported="false" />