diff options
| -rw-r--r-- | core/java/Android.bp | 5 | ||||
| -rw-r--r-- | libs/services/Android.bp | 47 | ||||
| -rw-r--r-- | libs/services/Android.mk | 44 |
3 files changed, 52 insertions, 44 deletions
diff --git a/core/java/Android.bp b/core/java/Android.bp index b43cf277aa57..afa08e65cbaa 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -3,6 +3,11 @@ filegroup { srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"], } +filegroup { + name: "IDropBoxManagerService.aidl", + srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"], +} + // only used by key_store_service cc_library_shared { name: "libkeystore_aidl", diff --git a/libs/services/Android.bp b/libs/services/Android.bp new file mode 100644 index 000000000000..e5e865f03739 --- /dev/null +++ b/libs/services/Android.bp @@ -0,0 +1,47 @@ +// 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", + "src/os/StatsLogEventWrapper.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", + ], +} diff --git a/libs/services/Android.mk b/libs/services/Android.mk deleted file mode 100644 index d72059aad93f..000000000000 --- a/libs/services/Android.mk +++ /dev/null @@ -1,44 +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 \ - src/os/StatsLogEventWrapper.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) - - |