diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-01-25 02:58:03 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-01-25 02:59:51 +0000 |
| commit | e86f3cb065b3901133b7fa05a9e847456f9d0939 (patch) | |
| tree | d4f235f3cc571585d3bcbb22655ce9c42ffe61e6 | |
| parent | c5b62178b3a7af557b01f637a92f04529194b3a4 (diff) | |
| download | android_packages_apps_Trebuchet-e86f3cb065b3901133b7fa05a9e847456f9d0939.tar.gz android_packages_apps_Trebuchet-e86f3cb065b3901133b7fa05a9e847456f9d0939.tar.bz2 android_packages_apps_Trebuchet-e86f3cb065b3901133b7fa05a9e847456f9d0939.zip | |
Put Trebuchet into its own namespace
We can do this with aapt, while retaining the ability to merge
upstream by leaving the files alone.
And add a migration line for com.android.launcher3 so users don't
lose their current cm11 workspaces
Change-Id: I3ddda3b0ec7500a7d79c27143edcdc3435f82666
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | AndroidManifest.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 09eca7a5c..7a6b3ba5b 100644 --- a/Android.mk +++ b/Android.mk @@ -38,6 +38,8 @@ LOCAL_PACKAGE_NAME := Trebuchet LOCAL_PRIVILEGED_MODULE := true #LOCAL_CERTIFICATE := shared +LOCAL_AAPT_FLAGS := --rename-manifest-package org.cyanogenmod.trebuchet + LOCAL_OVERRIDES_PACKAGES := Launcher3 LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d6fa33502..9e192544a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -48,7 +48,7 @@ /> <original-package android:name="com.cyanogenmod.trebuchet" /> - <original-package android:name="org.cyanogenmod.trebuchet" /> + <original-package android:name="com.android.launcher3" /> <uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.SET_WALLPAPER" /> |