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

Commit 4937fadf authored by Richard Uhler's avatar Richard Uhler
Browse files

Revert "Convert RollbackTest Android.mk to an Android.bp." 

This reverts commit 0145c883.

Reason for revert: Causes the RollbackTest apps to be installed to the system partition, which breaks the rollback tests.
Bug: 123695037

Change-Id: I3ee89ecb370144c67fe88bb389abafdda59dc502
parent 0145c883

tests/RollbackTest/Android.bp

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
// Copyright (C) 2018 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



android_app {

    name: "RollbackTestAppAv1",

    manifest: "TestApp/Av1.xml",

    sdk_version: "current",

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

}



android_app {

    name: "RollbackTestAppAv2",

    manifest: "TestApp/Av2.xml",

    sdk_version: "current",

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

}



android_app {

    name: "RollbackTestAppACrashingV2",

    manifest: "TestApp/ACrashingV2.xml",

    sdk_version: "current",

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

}



android_app {

    name: "RollbackTestAppBv1",

    manifest: "TestApp/Bv1.xml",

    sdk_version: "current",

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

}



android_app {

    name: "RollbackTestAppBv2",

    manifest: "TestApp/Bv2.xml",

    sdk_version: "current",

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

}



android_test {

    name: "RollbackTest",

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

    static_libs: ["android-support-test"],

    test_suites: ["general-tests"],

    java_resources: [

        ":RollbackTestAppAv1",

        ":RollbackTestAppAv2",

        ":RollbackTestAppACrashingV2",

        ":RollbackTestAppBv1",

        ":RollbackTestAppBv2",

    ],

    test_config: "RollbackTest.xml",

    sdk_version: "system_current",

}

tests/RollbackTest/Android.mk

0 → 100644
+94 −0
Original line number Diff line number Diff line 
# Copyright (C) 2018 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



LOCAL_PATH:= $(call my-dir)



# RollbackTestAppAv1.apk

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)

LOCAL_SDK_VERSION := current

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

LOCAL_MANIFEST_FILE := TestApp/Av1.xml

LOCAL_PACKAGE_NAME := RollbackTestAppAv1

include $(BUILD_PACKAGE)

ROLLBACK_TEST_APP_AV1 := $(LOCAL_INSTALLED_MODULE)



# RollbackTestAppAv2.apk

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)

LOCAL_SDK_VERSION := current

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

LOCAL_MANIFEST_FILE := TestApp/Av2.xml

LOCAL_PACKAGE_NAME := RollbackTestAppAv2

include $(BUILD_PACKAGE)

ROLLBACK_TEST_APP_AV2 := $(LOCAL_INSTALLED_MODULE)



# RollbackTestAppACrashingV2.apk

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)

LOCAL_SDK_VERSION := current

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

LOCAL_MANIFEST_FILE := TestApp/ACrashingV2.xml

LOCAL_PACKAGE_NAME := RollbackTestAppACrashingV2

include $(BUILD_PACKAGE)

ROLLBACK_TEST_APP_A_CRASHING_V2 := $(LOCAL_INSTALLED_MODULE)



# RollbackTestAppBv1.apk

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)

LOCAL_SDK_VERSION := current

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

LOCAL_MANIFEST_FILE := TestApp/Bv1.xml

LOCAL_PACKAGE_NAME := RollbackTestAppBv1

include $(BUILD_PACKAGE)

ROLLBACK_TEST_APP_BV1 := $(LOCAL_INSTALLED_MODULE)



# RollbackTestAppBv2.apk

include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)

LOCAL_SDK_VERSION := current

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

LOCAL_MANIFEST_FILE := TestApp/Bv2.xml

LOCAL_PACKAGE_NAME := RollbackTestAppBv2

include $(BUILD_PACKAGE)

ROLLBACK_TEST_APP_BV2 := $(LOCAL_INSTALLED_MODULE)



# RollbackTest

include $(CLEAR_VARS)

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

LOCAL_PACKAGE_NAME := RollbackTest

LOCAL_MODULE_TAGS := tests

LOCAL_STATIC_JAVA_LIBRARIES := android-support-test

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_JAVA_RESOURCE_FILES := \

  $(ROLLBACK_TEST_APP_AV1) \

  $(ROLLBACK_TEST_APP_AV2) \

  $(ROLLBACK_TEST_APP_A_CRASHING_V2) \

  $(ROLLBACK_TEST_APP_BV1) \

  $(ROLLBACK_TEST_APP_BV2)

LOCAL_SDK_VERSION := system_current

LOCAL_TEST_CONFIG := RollbackTest.xml

include $(BUILD_PACKAGE)



# Clean up local variables

ROLLBACK_TEST_APP_AV1 :=

ROLLBACK_TEST_APP_AV2 :=

ROLLBACK_TEST_APP_A_CRASHING_V2 :=

ROLLBACK_TEST_APP_BV1 :=

ROLLBACK_TEST_APP_BV2 :=