Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b499a438 authored by Joey's avatar Joey Committed by Michael Bestas
Browse files

Trebuchet: update build configs 



Change-Id: I072a85e068de4017c8d401785a89dc49296060cf
Signed-off-by: default avatarJoey <joey@lineageos.org>
parent af3034c3

Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ android_library { 
// Build rule for Launcher3 app.

// Build rule for Launcher3 app.

//

//

android_app {

android_app {

    name: "Launcher3",

    name: "Trebuchet",





    static_libs: [

    static_libs: [

        "Launcher3CommonDepsLib",

        "Launcher3CommonDepsLib",

Android.mk

+6 −6
Original line number Original line Diff line number Diff line
@@ -35,10 +35,10 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags 




LOCAL_SDK_VERSION := current

LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 26

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Launcher3Go

LOCAL_PACKAGE_NAME := TrebuchetGo

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep Launcher3Go

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3





LOCAL_FULL_LIBS_MANIFEST_FILES := \

LOCAL_FULL_LIBS_MANIFEST_FILES := \
@@ -68,10 +68,10 @@ else 
  LOCAL_SDK_VERSION := system_current

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

  LOCAL_MIN_SDK_VERSION := 26

endif

endif

LOCAL_PACKAGE_NAME := Launcher3QuickStep

LOCAL_PACKAGE_NAME := TrebuchetQuickStep

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3





LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res
@@ -121,10 +121,10 @@ LOCAL_RESOURCE_DIR := \ 
LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_ENABLED := full

LOCAL_PROGUARD_ENABLED := full





LOCAL_PACKAGE_NAME := Launcher3QuickStepGo

LOCAL_PACKAGE_NAME := TrebuchetQuickStepGo

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep Launcher3QuickStepGo

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3





LOCAL_FULL_LIBS_MANIFEST_FILES := \

LOCAL_FULL_LIBS_MANIFEST_FILES := \

AndroidManifest.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
-->

-->

<manifest

<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.launcher3">

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/>

    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/>

    <!--

    <!--
@@ -37,7 +38,8 @@ 
        android:theme="@style/AppTheme"

        android:theme="@style/AppTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >

        android:supportsRtl="true"

        tools:ignore="GoogleAppIndexingWarning">





        <!--

        <!--

        Main launcher activity. When extending only change the name, and keep all the

        Main launcher activity. When extending only change the name, and keep all the

tests/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -88,9 +88,9 @@ android_test { 
    ],

    ],

    use_embedded_native_libs: false,

    use_embedded_native_libs: false,

    compile_multilib: "both",

    compile_multilib: "both",

    instrumentation_for: "Launcher3",

    instrumentation_for: "Trebuchet",

    manifest: "AndroidManifest.xml",

    manifest: "AndroidManifest.xml",

    platform_apis: true,

    platform_apis: true,

    test_config: "Launcher3Tests.xml",

    test_config: "Launcher3Tests.xml",

    data: [":Launcher3"]

    data: [":Trebuchet"]

}
 
}