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

Commit 0f042ba5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert helper_apps of OverlayHostTests to Android.bp" into main am:... 

Merge "Convert helper_apps of OverlayHostTests to Android.bp" into main am: f4b99481 am: c2f549cd am: 6e3b215d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2884367



Change-Id: I3d28abd11fd8e564d453e2c3f55e571b187a1264
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bb4b466 6e3b215d

core/tests/overlaytests/Android.mk

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
# Copyright (C) 2017 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.



include $(call all-subdir-makefiles)

core/tests/overlaytests/host/Android.mk

deleted100644 → 0
+0 −19
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)



# Include to build test-apps.

include $(call all-makefiles-under,$(LOCAL_PATH))

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

deleted100644 → 0
+0 −16
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.



include $(call all-subdir-makefiles)

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

0 → 100644
+57 −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.



// Error: Cannot get the name of the license module in the

// ./Android.bp file.

// If no such license module exists, please add one there first.

// Then reset the default_applicable_licenses property below with the license module name.

package {

    // See: http://go/android-license-faq

    default_applicable_licenses: ["frameworks_base_license"],

}



android_test_helper_app {

    name: "OverlayHostTests_NonPlatformSignatureOverlay",

    sdk_version: "current",

    test_suites: ["device-tests"],

    aaptflags: [

        "--custom-package com.android.server.om.hosttest.signature_overlay_bad",

    ],

}



android_test_helper_app {

    name: "OverlayHostTests_PlatformSignatureStaticOverlay",

    sdk_version: "current",

    test_suites: ["device-tests"],

    certificate: "platform",

    manifest: "static/AndroidManifest.xml",

    aaptflags: [

        "--custom-package com.android.server.om.hosttest.signature_overlay_static",

    ],

}



android_test_helper_app {

    name: "OverlayHostTests_PlatformSignatureOverlay",

    sdk_version: "current",

    test_suites: ["device-tests"],

    certificate: "platform",

    aaptflags: [

        "--custom-package",

        "com.android.server.om.hosttest.signature_overlay_v1",

        "--version-code",

        "1",

        "--version-name",

        "v1",

    ],

}

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

deleted100644 → 0
+0 −56
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)



my_package_prefix := com.android.server.om.hosttest.signature_overlay



include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_NonPlatformSignatureOverlay

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_AAPT_FLAGS := --custom-package $(my_package_prefix)_bad

include $(BUILD_PACKAGE)



include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_PlatformSignatureStaticOverlay

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_CERTIFICATE := platform

LOCAL_MANIFEST_FILE := static/AndroidManifest.xml

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

include $(BUILD_PACKAGE)



include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_PlatformSignatureOverlay

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_CERTIFICATE := platform

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

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

include $(BUILD_PACKAGE)



my_package_prefix :=