Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert ExtServices/Android.mk to Android.bp."

Browse Source
This commit is contained in:
Jaewoong Jung
2019-05-16 20:59:27 +00:00
committed by Gerrit Code Review
parent bec47ed0fc 929ab361d6
commit 992fee4a09
4 changed files with 45 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/ExtServices/Android.bp Normal file
View File

@@ -0,0 +1,26 @@
// Copyright (C) 2016 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_app {
name: "ExtServices",
srcs: ["src/**/*.java"],
platform_apis: true,
certificate: "platform",
aaptflags: ["--shared-lib"],
export_package_resources: true,
optimize: {
proguard_flags_files: ["proguard.proguard"],
},
privileged: true,
}

42
packages/ExtServices/Android.mk
View File

@@ -1,42 +0,0 @@
# Copyright (C) 2016 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 := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := ExtServices
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
LOCAL_AAPT_FLAGS := --shared-lib
LOCAL_EXPORT_PACKAGE_RESOURCES := true
LOCAL_PROGUARD_FLAG_FILES := proguard.proguard
LOCAL_PRIVILEGED_MODULE := true
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
include $(call all-makefiles-under, $(LOCAL_PATH))
endif

19
packages/ExtServices/tests/Android.bp Normal file
View File

@@ -0,0 +1,19 @@
android_test {
name: "ExtServicesUnitTests",
certificate: "platform",
libs: [
"android.test.runner",
"android.test.base",
],
static_libs: [
"androidx.test.rules",
"mockito-target-minus-junit4",
"androidx.test.espresso.core",
"truth-prebuilt",
"testables",
],
// Include all test java files.
srcs: ["src/**/*.java"],
platform_apis: true,
instrumentation_for: "ExtServices",
}

25
packages/ExtServices/tests/Android.mk
View File

@@ -1,25 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# We only want this apk build for tests.
LOCAL_MODULE_TAGS := tests
LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
LOCAL_STATIC_JAVA_LIBRARIES := \
androidx.test.rules \
mockito-target-minus-junit4 \
androidx.test.espresso.core \
truth-prebuilt \
testables
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := ExtServicesUnitTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_INSTRUMENTATION_FOR := ExtServices
include $(BUILD_PACKAGE)