summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-11-10 10:35:02 -0800
committerAdnan <adnan@cyngn.com>2014-11-19 15:53:59 -0800
commit12ed20fe5260a7a3b7bedce4cf5e995fc1ac281a (patch)
tree4d11f9a7f70f4eb51622ea1817c979206c127e0c /Android.mk
parentb7747dd0bfbf493120b38fbd0ec5252b3ed85ca2 (diff)
downloadandroid_packages_apps_Trebuchet-12ed20fe5260a7a3b7bedce4cf5e995fc1ac281a.tar.gz
android_packages_apps_Trebuchet-12ed20fe5260a7a3b7bedce4cf5e995fc1ac281a.tar.bz2
android_packages_apps_Trebuchet-12ed20fe5260a7a3b7bedce4cf5e995fc1ac281a.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
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 59bc8961d..103edfb74 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,7 +41,9 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
LOCAL_PACKAGE_NAME := Launcher3
#LOCAL_CERTIFICATE := shared
-LOCAL_OVERRIDES_PACKAGES := Launcher2
+LOCAL_AAPT_FLAGS := --rename-manifest-package org.cyanogenmod.trebuchet
+
+LOCAL_OVERRIDES_PACKAGES := Launcher3
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_PROGUARD_ENABLED := disabled