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

Commit 9beab998 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Convert Android.mk file to Android.bp"

parents 07a279af 4bef6158
Loading
Loading
Loading
Loading

Android.bp

0 → 100644
+77 −0
Original line number Diff line number Diff line
// Build the Telecom service.
android_app {
    name: "Telecom",
    libs: ["telephony-common"],
    srcs: [
        "src/**/*.java",
        "proto/**/*.proto",
    ],
    resource_dirs: ["res"],
    proto: {
        type: "nano",
        local_include_dirs: ["proto/"],
        output_params: ["optional_field_style=accessors"],
    },
    platform_apis: true,
    certificate: "platform",
    privileged: true,
    optimize: {
        proguard_flags_files: ["proguard.flags"],
    },
    defaults: ["SettingsLibDefaults"],
}

android_test {
    name: "TelecomUnitTests",
    static_libs: [
        "android-ex-camera2",
        "guava",
        "mockito-target-inline",
        "android-support-test",
        "platform-test-annotations",
        "androidx.legacy_legacy-support-core-ui",
        "androidx.legacy_legacy-support-core-utils",
        "androidx.core_core",
        "androidx.fragment_fragment",
    ],
    srcs: [
        "tests/src/**/*.java",
        "src/**/*.java",
        "proto/**/*.proto",
    ],
    proto: {
        type: "nano",
        local_include_dirs: ["proto/"],
        output_params: ["optional_field_style=accessors"],
    },
    resource_dirs: [
        "tests/res",
        "res",
    ],
    libs: [
        "android.test.mock",
        "android.test.base",
        "android.test.runner",
        "telephony-common",
    ],

    jni_libs: ["libdexmakerjvmtiagent"],

    aaptflags: [
        "--auto-add-overlay",
        "--extra-packages",
        "com.android.server.telecom",
    ],
    manifest: "tests/AndroidManifest.xml",
    optimize: {
        enabled: false,
    },
    platform_apis: true,
    certificate: "platform",
    jacoco: {
        include_filter: ["com.android.server.telecom.*"],
        exclude_filter: ["com.android.server.telecom.tests.*"],
    },
    test_suites: ["device-tests"],
    defaults: ["SettingsLibDefaults"],
}

Android.mk

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line
LOCAL_PATH:= $(call my-dir)

# Build the Telecom service.
include $(CLEAR_VARS)

LOCAL_JAVA_LIBRARIES := telephony-common

LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-under, proto)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_USE_AAPT2 := true

LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/proto/
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors

LOCAL_PACKAGE_NAME := Telecom
LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true

LOCAL_PROGUARD_FLAG_FILES := proguard.flags

include frameworks/base/packages/SettingsLib/common.mk

include $(BUILD_PACKAGE)

# Build the test package.
include $(call all-makefiles-under,$(LOCAL_PATH))

testapps/Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line
//
// Copyright (C) 2013 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: "TelecomTestApps",
    static_libs: [
        "android-support-v4",
        "android-ex-camera2",
        "guava",
    ],
    srcs: ["src/**/*.java"],
    platform_apis: true,
    certificate: "platform",
}

testapps/Android.mk

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line
#
# Copyright (C) 2013 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_STATIC_JAVA_LIBRARIES := \
        android-support-v4 \
        android-ex-camera2 \
        guava

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

LOCAL_PACKAGE_NAME := TelecomTestApps
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform

LOCAL_MODULE_TAGS := tests

include $(BUILD_PACKAGE)

tests/Android.mk

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line
#
# Copyright (C) 2013 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_STATIC_JAVA_LIBRARIES := \
    android-ex-camera2 \
    guava \
    mockito-target-inline \
    android-support-test \
    platform-test-annotations

LOCAL_STATIC_ANDROID_LIBRARIES := \
    androidx.legacy_legacy-support-core-ui \
    androidx.legacy_legacy-support-core-utils \
    androidx.core_core \
    androidx.fragment_fragment

LOCAL_SRC_FILES := \
    $(call all-java-files-under, src) \
    $(call all-java-files-under, ../src) \
    $(call all-proto-files-under, ../proto)

LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/../proto/
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors

LOCAL_RESOURCE_DIR := \
    $(LOCAL_PATH)/res \
    $(LOCAL_PATH)/../res

LOCAL_JAVA_LIBRARIES := \
    android.test.mock \
    android.test.base \
    android.test.runner \
    telephony-common

LOCAL_USE_AAPT2 := true

LOCAL_JNI_SHARED_LIBRARIES := \
    libdexmakerjvmtiagent \

LOCAL_AAPT_FLAGS := \
    --auto-add-overlay \
    --extra-packages com.android.server.telecom

LOCAL_PROGUARD_ENABLED := disabled

LOCAL_PACKAGE_NAME := TelecomUnitTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform

LOCAL_MODULE_TAGS := tests

LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.server.telecom.*
LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := com.android.server.telecom.tests.*

LOCAL_COMPATIBILITY_SUITE := device-tests
include frameworks/base/packages/SettingsLib/common.mk

include $(BUILD_PACKAGE)