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

Commit 4af8cf92 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Updating test build rules 

> Moving definition to bp files
> Adding mokito-inline to allow mocking final classes
> Moving src_common to src to avoid unnecessary code split

Bug: 196825541
Test: Presubmit
Change-Id: Ib6879cda6aee74f5b9050a16eb6ca94ed3b7e28c
parent 0ec3e647

Android.bp

+21 −1
Original line number Diff line number Diff line
@@ -224,7 +224,6 @@ filegroup { 
    srcs: ["proguard.flags"],

}





// Library with all the dependencies for building Launcher Go

android_library {

    name: "LauncherGoResLib",
@@ -253,3 +252,24 @@ android_library { 
    },

}



// Build rule for Quickstep library

android_library {

    name: "Launcher3QuickStepLib",

    srcs: [

        ":launcher-src-no-build-config",

    ],

    resource_dirs: [

        "quickstep/res",

    ],

    static_libs: [

        "SystemUI-statsd",

        "SystemUISharedLib",

        "Launcher3CommonDepsLib"

    ],

    manifest: "quickstep/AndroidManifest.xml",

    platform_apis: true,

    min_sdk_version: "current",

    lint: {

        baseline_filename: "lint-baseline-launcher3.xml",

    },

}

Android.mk

+0 −36
Original line number Diff line number Diff line
@@ -52,42 +52,6 @@ LOCAL_LICENSE_CONDITIONS := notice 
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE

include $(BUILD_PACKAGE)



#

# Build rule for Quickstep library.

#

include $(CLEAR_VARS)

LOCAL_USE_AAPT2 := true

LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional



LOCAL_STATIC_JAVA_LIBRARIES := \

    SystemUI-statsd \

    SystemUISharedLib

ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

  LOCAL_SDK_VERSION := system_current

  LOCAL_MIN_SDK_VERSION := 26

endif

LOCAL_MODULE := Launcher3QuickStepLib

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE

LOCAL_PRIVILEGED_MODULE := true

LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src) \

    $(call all-java-files-under, quickstep/src) \

    $(call all-java-files-under, src_shortcuts_overrides)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res

LOCAL_PROGUARD_ENABLED := disabled





LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml

include $(BUILD_STATIC_JAVA_LIBRARY)



#

# Build rule for Quickstep app.

#

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
        android:fullBackupOnly="true"

        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:debuggable="true"

        android:icon="@drawable/ic_launcher_home"

        android:label="@string/derived_app_name"

        android:theme="@style/AppTheme"

quickstep/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -26,3 +26,19 @@ filegroup { 
    path: "robolectric_tests",

    srcs: ["robolectric_tests/src/**/*.java"],

}



filegroup {

    name: "launcher3-quickstep-tests-src",

    path: "tests",

    srcs: ["tests/src/**/*.java"],

}



filegroup {

    name: "launcher3-quickstep-oop-tests-src",

    path: "tests",

    srcs: [

        "tests/src/com/android/quickstep/NavigationModeSwitchRule.java",

        "tests/src/com/android/quickstep/AbstractQuickStepTest.java",

        "tests/src/com/android/quickstep/TaplTestsQuickstep.java",

    ]

}

quickstep/tests/src/com/android/quickstep/ViewInflationDuringSwipeUp.java

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ import static androidx.test.InstrumentationRegistry.getContext; 
import static androidx.test.InstrumentationRegistry.getInstrumentation;

import static androidx.test.InstrumentationRegistry.getTargetContext;



import static com.android.launcher3.common.WidgetUtils.createWidgetInfo;

import static com.android.launcher3.testcomponent.TestCommandReceiver.EXTRA_VALUE;

import static com.android.launcher3.testcomponent.TestCommandReceiver.SET_LIST_VIEW_SERVICE_BINDER;

import static com.android.launcher3.util.WidgetUtils.createWidgetInfo;

import static com.android.quickstep.NavigationModeSwitchRule.Mode.ZERO_BUTTON;



import static org.junit.Assert.assertEquals;