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

Commit c4209c3f authored by Felka Chang's avatar Felka Chang
Browse files

put OverlayHostTests files into device-tests and general-tests 

OverlayHostTests is only in general-tests.zip. However,
OverlayHostTests_NonPlatformSignatureOverlay.apk,
OverlayHostTests_PlatformSignatureStaticOverlay.apk,
OverlayHostTests_PlatformSignatureOverlay.apk,
OverlayHostTests_UpdateOverlay.apk,
OverlayHostTests_FrameworkOverlayV1.apk,
OverlayHostTests_FrameworkOverlayV2.apk,
OverlayHostTests_AppOverlayV1.apk and
OverlayHostTests_AppOverlayV2.apk are only in device-tests.zip.

All of OverlayHostTest related files should be archived into both
of device-tests.zip and general-tests.zip.

Fixes: 200698485

Test: make general-tests device-tests ; \
    assertFiles() { \
        unzip -l "$1" | awk \
        '$4 ~ /OverlayHostTests.jar$/ { print $4 ; numberOfJar++ } \
        $4 ~ /OverlayHostTest.*.apk$/ { print $4 ; numberOfApk++ } \
        END { \
            if (numberOfApk != 8) { print "Fail for the apk files" } \
            if (numberOfJar != 1) { print "Fail for the jar file" } \
        }' ;\
    } ;\
    assertFiles "$ANDROID_PRODUCT_OUT/device-tests.zip" ;\
    assertFiles "$ANDROID_PRODUCT_OUT/general-tests.zip"

Change-Id: Ia9020a2b61122b8f71ea8536b2866d52ab1ab2b6
parent 99d4c2fd

core/tests/overlaytests/host/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ java_test_host { 
    name: "OverlayHostTests",

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

    libs: ["tradefed"],

    test_suites: ["general-tests"],

    test_suites: [

        "device-tests",

        "general-tests",

    ],

    target_required: [

        "OverlayHostTests_NonPlatformSignatureOverlay",

        "OverlayHostTests_PlatformSignatureStaticOverlay",

core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := device-tests general-tests

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_bad

include $(BUILD_PACKAGE)
@@ -34,7 +34,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := device-tests general-tests

LOCAL_CERTIFICATE := platform

LOCAL_MANIFEST_FILE := static/AndroidManifest.xml

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_static
@@ -47,7 +47,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := device-tests general-tests

LOCAL_CERTIFICATE := platform

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1

LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1

core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := device-tests general-tests

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal
@@ -37,7 +37,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := device-tests general-tests

LOCAL_CERTIFICATE := platform

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1

LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1
@@ -52,7 +52,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := device-tests general-tests

LOCAL_CERTIFICATE := platform

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v2

LOCAL_AAPT_FLAGS += --version-code 2 --version-name v2
@@ -69,7 +69,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := device-tests general-tests

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1

LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/app/v1/res
@@ -83,7 +83,7 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 
LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../../NOTICE

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_COMPATIBILITY_SUITE := device-tests general-tests

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v2

LOCAL_AAPT_FLAGS += --version-code 2 --version-name v2

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/app/v2/res