Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert OverlayHostTests to Android.bp"

Browse Source 
am: 482b636291

Change-Id: I9b49f8df85597665c0dee0576c0d156b0211f31a
This commit is contained in:
Dan Willemsen
2020-01-21 10:57:46 -08:00
committed by android-build-merger
parent 2260679ecd 482b636291
commit 621c06bd7d
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/tests/overlaytests/host/Android.bp Normal file
View File

@@ -0,0 +1,30 @@
// 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.
java_test_host {
name: "OverlayHostTests",
srcs: ["src/**/*.java"],
libs: ["tradefed"],
test_suites: ["general-tests"],
target_required: [
"OverlayHostTests_NonPlatformSignatureOverlay",
"OverlayHostTests_PlatformSignatureStaticOverlay",
"OverlayHostTests_PlatformSignatureOverlay",
"OverlayHostTests_UpdateOverlay",
"OverlayHostTests_FrameworkOverlayV1",
"OverlayHostTests_FrameworkOverlayV2",
"OverlayHostTests_AppOverlayV1",
"OverlayHostTests_AppOverlayV2",
],
}

17
core/tests/overlaytests/host/Android.mk
View File

@@ -14,23 +14,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE := OverlayHostTests
LOCAL_JAVA_LIBRARIES := tradefed
LOCAL_COMPATIBILITY_SUITE := general-tests
LOCAL_TARGET_REQUIRED_MODULES := \
OverlayHostTests_NonPlatformSignatureOverlay \
OverlayHostTests_PlatformSignatureStaticOverlay \
OverlayHostTests_PlatformSignatureOverlay \
OverlayHostTests_UpdateOverlay \
OverlayHostTests_FrameworkOverlayV1 \
OverlayHostTests_FrameworkOverlayV2 \
OverlayHostTests_AppOverlayV1 \
OverlayHostTests_AppOverlayV2
include $(BUILD_HOST_JAVA_LIBRARY)
# Include to build test-apps. # Include to build test-apps.
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))