Browse Source

Convert Android.mk file to Android.bp

Files failing automerge from AOSP.
See build/soong/README.md for more information.

Bug: 122332340
Test: treehugger
Change-Id: I92f7584aeaf502336f67e04fbc22634784c9305d
ten
Sasha Smundak 2 years ago
parent
commit
b61bab6a58

+ 26
- 0
keystore/tests/Android.bp View File

@@ -0,0 +1,26 @@
// 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.

android_test {
name: "KeystoreTests",
// LOCAL_MODULE := keystore
srcs: ["src/**/*.java"],
static_libs: [
"androidx.test.rules",
"hamcrest-library",
],
platform_apis: true,
libs: ["android.test.runner"],
certificate: "platform",
}

+ 0
- 34
keystore/tests/Android.mk View File

@@ -1,34 +0,0 @@
# 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.

LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

# LOCAL_MODULE := keystore
LOCAL_MODULE_TAGS := tests

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

LOCAL_STATIC_JAVA_LIBRARIES := \
androidx.test.rules hamcrest-library

LOCAL_PACKAGE_NAME := KeystoreTests
LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_CERTIFICATE := platform

include $(BUILD_PACKAGE)


+ 0
- 17
location/Android.mk View File

@@ -1,17 +0,0 @@
# Copyright (C) 2010 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 $(call all-subdir-makefiles, $(LOCAL_PATH))

+ 1
- 0
location/tests/Android.bp View File

@@ -0,0 +1 @@


+ 0
- 3
location/tests/Android.mk View File

@@ -1,3 +0,0 @@
LOCAL_PATH:= $(call my-dir)

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

+ 19
- 0
location/tests/locationtests/Android.bp View File

@@ -0,0 +1,19 @@
android_test {
name: "FrameworksLocationTests",
// Include all test java files.
srcs: ["src/**/*.java"],
libs: [
"android.test.runner",
"android.test.base",
],
platform_apis: true,
static_libs: [
"androidx.test.rules",
"core-test-rules",
"guava",
"mockito-target-minus-junit4",
"frameworks-base-testutils",
"truth-prebuilt",
],
test_suites: ["device-tests"],
}

+ 0
- 23
location/tests/locationtests/Android.mk View File

@@ -1,23 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

# We only want this apk build for tests.
LOCAL_MODULE_TAGS := tests

# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
LOCAL_PACKAGE_NAME := FrameworksLocationTests
LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_STATIC_JAVA_LIBRARIES := \
androidx.test.rules \
core-test-rules \
guava \
mockito-target-minus-junit4 \
frameworks-base-testutils \
truth-prebuilt \

LOCAL_COMPATIBILITY_SUITE := device-tests
include $(BUILD_PACKAGE)

+ 14
- 0
media/tests/MediaFrameworkTest/Android.bp View File

@@ -0,0 +1,14 @@
android_test {
name: "mediaframeworktest",
srcs: ["**/*.java"],
libs: [
"android.test.runner",
"android.test.base",
],
static_libs: [
"mockito-target-minus-junit4",
"androidx.test.rules",
"android-ex-camera2",
],
platform_apis: true,
}

+ 0
- 18
media/tests/MediaFrameworkTest/Android.mk View File

@@ -1,18 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base

LOCAL_STATIC_JAVA_LIBRARIES := \
mockito-target-minus-junit4 \
androidx.test.rules \
android-ex-camera2

LOCAL_PACKAGE_NAME := mediaframeworktest
LOCAL_PRIVATE_PLATFORM_APIS := true

include $(BUILD_PACKAGE)

+ 6
- 0
media/tests/MtpTests/Android.bp View File

@@ -0,0 +1,6 @@
android_test {
name: "MtpTests",
srcs: ["**/*.java"],
static_libs: ["androidx.test.rules"],
platform_apis: true,
}

+ 0
- 13
media/tests/MtpTests/Android.mk View File

@@ -1,13 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := $(call all-subdir-java-files)

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules

LOCAL_PACKAGE_NAME := MtpTests
LOCAL_PRIVATE_PLATFORM_APIS := true

include $(BUILD_PACKAGE)

+ 37
- 21
startop/iorap/tests/Android.bp View File

@@ -16,32 +16,48 @@
java_library {
name: "libiorap-java-test-lib",
srcs: ["src/**/*.kt"],

static_libs: [
// Non-test dependencies

// library under test
"services.startop.iorap",
// need the system_server code to be on the classpath,
"services.core",

// Test Dependencies

// test android dependencies
"platform-test-annotations",
"androidx.test.rules",
// test framework dependencies
"mockito-target-inline-minus-junit4",
// "mockito-target-minus-junit4",
// Non-test dependencies
// library under test
"services.startop.iorap",
// need the system_server code to be on the classpath,
"services.core",
// Test Dependencies
// test android dependencies
"platform-test-annotations",
"androidx.test.rules",
// test framework dependencies
"mockito-target-inline-minus-junit4",
// "mockito-target-minus-junit4",
// Mockito also requires JNI (see Android.mk)
// and android:debuggable=true (see AndroidManifest.xml)
"truth-prebuilt",
"truth-prebuilt",
],

// sdk_version: "current",
// certificate: "platform",

libs: ["android.test.base", "android.test.runner"],

libs: [
"android.test.base",
"android.test.runner",
],
// test_suites: ["device-tests"],
}

android_test {
name: "libiorap-java-tests",
dxflags: ["--multi-dex"],
test_suites: ["device-tests"],
static_libs: ["libiorap-java-test-lib"],
compile_multilib: "both",
jni_libs: [
"libdexmakerjvmtiagent",
"libstaticjvmtiagent",
"libmultiplejvmtiagentsinterferenceagent",
],
libs: [
"android.test.base",
"android.test.runner",
],
// Use private APIs
certificate: "platform",
platform_apis: true,
}

+ 0
- 49
startop/iorap/tests/Android.mk View File

@@ -1,49 +0,0 @@
# 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 does not support JNI libraries
# TODO: once b/80095087 is fixed, rewrite this back to android_test
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE_TAGS := tests

LOCAL_JACK_FLAGS := --multi-dex native
LOCAL_DX_FLAGS := --multi-dex

LOCAL_PACKAGE_NAME := libiorap-java-tests
LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_STATIC_JAVA_LIBRARIES := \
libiorap-java-test-lib

LOCAL_MULTILIB := both

LOCAL_JNI_SHARED_LIBRARIES := \
libdexmakerjvmtiagent \
libstaticjvmtiagent \
libmultiplejvmtiagentsinterferenceagent

LOCAL_JAVA_LIBRARIES := \
android.test.base \
android.test.runner

# Use private APIs
LOCAL_CERTIFICATE := platform
LOCAL_PRIVATE_PLATFORM_APIS := true

# Disable presubmit test until it works with disabled iorap by default.
LOCAL_PRESUBMIT_DISABLED := true

include $(BUILD_PACKAGE)

Loading…
Cancel
Save