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

Merge "base: Convert libs/services/Android.mk into a blueprint"

Browse Source
This commit is contained in:
Treehugger Robot
2018-01-12 12:39:35 +00:00
committed by Gerrit Code Review
parent 2fef505e1e 2bfba3afbf
commit f0561142f3
3 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/Android.bp
View File

@@ -2,3 +2,8 @@ filegroup {
name: "IKeyAttestationApplicationIdProvider.aidl", name: "IKeyAttestationApplicationIdProvider.aidl",
srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"], srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],
} }
filegroup {
name: "IDropBoxManagerService.aidl",
srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"],
}

46
libs/services/Android.bp Normal file
View File

@@ -0,0 +1,46 @@
// 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.
// Provides C++ wrappers for system services.
cc_library_shared {
name: "libservices",
srcs: [
":IDropBoxManagerService.aidl",
"src/os/DropBoxManager.cpp",
],
shared_libs: [
"libbinder",
"liblog",
"libcutils",
"libutils",
],
header_libs: [
"libbase_headers",
],
aidl: {
include_dirs: ["frameworks/base/core/java/"],
},
export_include_dirs: ["include"],
export_header_lib_headers: ["libbase_headers"],
cflags: [
"-Wall",
"-Werror",
"-Wunused",
"-Wunreachable-code",
],
}

43
libs/services/Android.mk
View File

@@ -1,43 +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)
# Provides C++ wrappers for system services.
include $(CLEAR_VARS)
LOCAL_MODULE := libservices
LOCAL_SRC_FILES := \
../../core/java/com/android/internal/os/IDropBoxManagerService.aidl \
src/os/DropBoxManager.cpp
LOCAL_AIDL_INCLUDES := \
$(LOCAL_PATH)/../../core/java
LOCAL_C_INCLUDES := \
system/core/include
LOCAL_SHARED_LIBRARIES := \
libbinder \
liblog \
libcutils \
libutils
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY)