Merge "Convert Android.mk file to Android.bp"
am: e6bcf626be
Change-Id: I960027bd43c94d6d9908b83a1a13bffab8973549
This commit is contained in:
Sasha Smundak
23
keystore/tests/Android.bp
Normal file
23
keystore/tests/Android.bp
Normal file
@@ -0,0 +1,23 @@
|
||||
// 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: ["android-support-test"],
|
||||
platform_apis: true,
|
||||
libs: ["android.test.runner"],
|
||||
certificate: "platform",
|
||||
}
|
||||
@@ -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 := \
|
||||
android-support-test
|
||||
|
||||
LOCAL_PACKAGE_NAME := KeystoreTests
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
|
||||
LOCAL_JAVA_LIBRARIES := android.test.runner
|
||||
|
||||
LOCAL_CERTIFICATE := platform
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
@@ -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
location/tests/Android.bp
Normal file
1
location/tests/Android.bp
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
LOCAL_PATH:= $(call my-dir)
|
||||
|
||||
include $(call all-makefiles-under, $(LOCAL_PATH))
|
||||
19
location/tests/locationtests/Android.bp
Normal file
19
location/tests/locationtests/Android.bp
Normal 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: [
|
||||
"android-support-test",
|
||||
"core-test-rules",
|
||||
"guava",
|
||||
"mockito-target-minus-junit4",
|
||||
"frameworks-base-testutils",
|
||||
"truth-prebuilt",
|
||||
],
|
||||
test_suites: ["device-tests"],
|
||||
}
|
||||
@@ -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 := \
|
||||
android-support-test \
|
||||
core-test-rules \
|
||||
guava \
|
||||
mockito-target-minus-junit4 \
|
||||
frameworks-base-testutils \
|
||||
truth-prebuilt \
|
||||
|
||||
LOCAL_COMPATIBILITY_SUITE := device-tests
|
||||
include $(BUILD_PACKAGE)
|
||||
14
media/tests/MediaFrameworkTest/Android.bp
Normal file
14
media/tests/MediaFrameworkTest/Android.bp
Normal file
@@ -0,0 +1,14 @@
|
||||
android_test {
|
||||
name: "mediaframeworktest",
|
||||
srcs: ["**/*.java"],
|
||||
libs: [
|
||||
"android.test.runner",
|
||||
"android.test.base",
|
||||
],
|
||||
static_libs: [
|
||||
"mockito-target-minus-junit4",
|
||||
"android-support-test",
|
||||
"android-ex-camera2",
|
||||
],
|
||||
platform_apis: true,
|
||||
}
|
||||
@@ -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 \
|
||||
android-support-test \
|
||||
android-ex-camera2
|
||||
|
||||
LOCAL_PACKAGE_NAME := mediaframeworktest
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
6
media/tests/MtpTests/Android.bp
Normal file
6
media/tests/MtpTests/Android.bp
Normal file
@@ -0,0 +1,6 @@
|
||||
android_test {
|
||||
name: "MtpTests",
|
||||
srcs: ["**/*.java"],
|
||||
static_libs: ["android-support-test"],
|
||||
platform_apis: true,
|
||||
}
|
||||
@@ -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 := android-support-test
|
||||
|
||||
LOCAL_PACKAGE_NAME := MtpTests
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
@@ -16,7 +16,6 @@
|
||||
java_library {
|
||||
name: "libiorap-java-test-lib",
|
||||
srcs: ["src/**/*.kt"],
|
||||
|
||||
static_libs: [
|
||||
// non-test dependencies
|
||||
"libiorap-java",
|
||||
@@ -28,13 +27,33 @@ java_library {
|
||||
// "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,
|
||||
}
|
||||
|
||||
@@ -1,46 +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
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
Reference in New Issue
Block a user