04e84e0ee9
RollbackManagerService incorrectly ignores the package name passed to getAvailableRollback and executeRollback. This CL fixes the bug and adds a regression test. The infrastructure for having multiple test apps in RollbackTest will also be useful for testing rollback of multi-package installs. Test: atest RollbackTest (with selinux disabled) Bug: 112431924 Change-Id: I84c8fdeb97aba557a1f8fd2e71a2bb0d87b10636
82 lines
2.7 KiB
Makefile
82 lines
2.7 KiB
Makefile
# 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)
|
|
|
|
# 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_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_BV1 :=
|
|
ROLLBACK_TEST_APP_BV2 :=
|