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
commit916ba22867bbbe05edc6ccc39622f0e569b00d58 (patch)
treeacb15d42e2ccf86f7d7f03e3dcaec1607ed899a0 /Android.mk
parent12ed20fe5260a7a3b7bedce4cf5e995fc1ac281a (diff)
downloadandroid_packages_apps_Trebuchet-916ba22867bbbe05edc6ccc39622f0e569b00d58.tar.gz
android_packages_apps_Trebuchet-916ba22867bbbe05edc6ccc39622f0e569b00d58.tar.bz2
android_packages_apps_Trebuchet-916ba22867bbbe05edc6ccc39622f0e569b00d58.zip
Fix L2 and old Trebuchet migration
There can only be one original-package tag. Go with com.android.launcher3 for now, and move Trebuchet back to com.cyanogenmod.trebuchet. This will allow for workspace migrations from both CM10.2 Trebuchet and from CM11 Launcher3 Change-Id: I7743954bffc55f503851038f800607947e20015e
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 103edfb74..5cdc0030d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,10 +38,10 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
# LOCAL_SDK_VERSION := 21
-LOCAL_PACKAGE_NAME := Launcher3
+LOCAL_PACKAGE_NAME := Trebuchet
#LOCAL_CERTIFICATE := shared
-LOCAL_AAPT_FLAGS := --rename-manifest-package org.cyanogenmod.trebuchet
+LOCAL_AAPT_FLAGS += --rename-manifest-package com.cyanogenmod.trebuchet
LOCAL_OVERRIDES_PACKAGES := Launcher3