diff options
-rw-r--r-- | Android.mk | 8 | ||||
-rw-r--r-- | AndroidManifest.xml | 3 | ||||
-rw-r--r-- | tests/Android.mk | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index ad8ce0247..706ba2538 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 6c5990d1b..211d592f0 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 61ee220e8..b5df98d14 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) |