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

Commit aea90681 authored by Dan Shi's avatar Dan Shi
Browse files

Convert Android.mk to Android.bp 

Bug: 138416078
Test: atest OverlayDeviceTests
Change-Id: I995e923a8769d832fcb8a8ed2c687ce757e92a8e
parent c7487391

core/tests/overlaytests/device/Android.bp

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



android_test {

    name: "OverlayDeviceTests",

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

    platform_apis: true,

    static_libs: ["androidx.test.rules"],

    test_suites: ["device-tests"],

    data: [

        ":OverlayDeviceTests_AppOverlayOne",

        ":OverlayDeviceTests_AppOverlayTwo",

        ":OverlayDeviceTests_FrameworkOverlay",

    ],

}

core/tests/overlaytests/device/Android.mk

deleted100644 → 0
+0 −32
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 $(CLEAR_VARS)

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

LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayDeviceTests

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_REQUIRED_MODULES := \

    OverlayDeviceTests_AppOverlayOne \

    OverlayDeviceTests_AppOverlayTwo \

    OverlayDeviceTests_FrameworkOverlay

include $(BUILD_PACKAGE)



# Include to build test-apps.

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

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

deleted100644 → 0
+0 −15
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/device/test-apps/AppOverlayOne/Android.bp

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



android_test {

    name: "OverlayDeviceTests_AppOverlayOne",

    sdk_version: "current",



    aaptflags: ["--no-resource-removal"],

}

core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.mk

deleted100644 → 0
+0 −24
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 $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayDeviceTests_AppOverlayOne

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)