summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-11-24 22:39:53 (GMT)
committerMichael Bestas <mikeioannina@gmail.com>2017-04-27 16:57:22 (GMT)
commit64ad519c135dcbc45e87818adb3c135766a24c38 (patch)
tree5083cdb4b9464ba83aa2daf08b5276bc8567d095
parent28a64381b67d72fcc8b994343507ed9c5821df53 (diff)
downloadandroid_packages_apps_Trebuchet-64ad519c135dcbc45e87818adb3c135766a24c38.zip
android_packages_apps_Trebuchet-64ad519c135dcbc45e87818adb3c135766a24c38.tar.gz
android_packages_apps_Trebuchet-64ad519c135dcbc45e87818adb3c135766a24c38.tar.bz2
We shall call it Trebuchet
Change-Id: I068d7e025bb01fd4216be3ffcf3cdfd3285be9da
-rw-r--r--Android.mk8
-rw-r--r--AndroidManifest.xml3
-rw-r--r--tests/Android.mk4
3 files changed, 10 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index ad8ce02..706ba25 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,8 +47,10 @@ LOCAL_AAPT_FLAGS := \
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 21
-LOCAL_PACKAGE_NAME := Launcher3
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2
+LOCAL_PACKAGE_NAME := Trebuchet
+LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package org.lineageos.trebuchet
LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
@@ -67,7 +69,7 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := launcher_proto_lib
+LOCAL_MODULE := trebuchet_proto_lib
LOCAL_IS_HOST_MODULE := true
LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-nano
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6c5990d..211d592 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,9 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.launcher3">
+
+ <original-package android:name="com.cyanogenmod.trebuchet" />
+
<uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>
<!--
Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
diff --git a/tests/Android.mk b/tests/Android.mk
index 61ee220..b5df98d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -23,8 +23,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SDK_VERSION := current
-LOCAL_PACKAGE_NAME := Launcher3Tests
+LOCAL_PACKAGE_NAME := TrebuchetTests
-LOCAL_INSTRUMENTATION_FOR := Launcher3
+LOCAL_INSTRUMENTATION_FOR := Trebuchet
include $(BUILD_PACKAGE)