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

Commit 995887ea authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Convert packages/Shell/**/Android.mk file to Android.bp 

See build/soong/README.md for more information.

Bug: 122332340
Test: atest ShellTests
(same errors as baseline)
Change-Id: I63b777342359e0b42ccd554b7d056c7431178380
parent 1764f6a4

packages/Shell/Android.bp

0 → 100644
+14 −0
Original line number Diff line number Diff line 
android_app {

    name: "Shell",

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

    aidl: {

        include_dirs: ["frameworks/native/cmds/dumpstate/binder"],

    },

    static_libs: ["androidx.legacy_legacy-support-v4"],

    platform_apis: true,

    certificate: "platform",

    privileged: true,

    jacoco: {

        include_filter: ["com.android.shell.*"],

    },

}

packages/Shell/Android.mk

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_SRC_FILES += \

        ../../../native/cmds/dumpstate/binder/android/os/IDumpstate.aidl \

        ../../../native/cmds/dumpstate/binder/android/os/IDumpstateListener.aidl \

        ../../../native/cmds/dumpstate/binder/android/os/IDumpstateToken.aidl



LOCAL_AIDL_INCLUDES = frameworks/native/cmds/dumpstate/binder



LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4

LOCAL_USE_AAPT2 := true



LOCAL_PACKAGE_NAME := Shell

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true



LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.shell.*



include $(BUILD_PACKAGE)



include $(LOCAL_PATH)/tests/Android.mk

packages/Shell/tests/Android.bp

0 → 100644
+19 −0
Original line number Diff line number Diff line 
android_test {

    name: "ShellTests",

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

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

    ],

    static_libs: [

        "androidx.test.rules",

        "mockito-target-minus-junit4",

        "ub-uiautomator",

        "junit",

    ],

    platform_apis: true,

    test_suites: ["device-tests"],

    instrumentation_for: "Shell",

    certificate: "platform",

}

packages/Shell/tests/Android.mk

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 


LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := tests



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock



LOCAL_STATIC_JAVA_LIBRARIES := \

    androidx.test.rules \

    mockito-target-minus-junit4 \

    ub-uiautomator \

    junit \



LOCAL_PACKAGE_NAME := ShellTests

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_INSTRUMENTATION_FOR := Shell



LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)