diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 23:57:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 23:57:25 +0000 |
commit | 166c45de878df34b3b6816292103a6a0771c754b (patch) | |
tree | 89e84b1e23137acfec7fd1f014c4ef3fadda80fb | |
parent | 668e6973b5372816f22934d4500a24d2b106c8d1 (diff) | |
parent | 57b2eaa36eb81481f680847650b4ded33404b281 (diff) | |
download | libhidl-166c45de878df34b3b6816292103a6a0771c754b.tar.gz |
Recombine hidl lib build. am: 55d2dcd389 am: 3ed069145a am: 57b2eaa36e
Change-Id: Iacc2ff8e449057a54c17688bbed22cf9554b7e61
-rw-r--r-- | Android.bp | 109 | ||||
-rw-r--r-- | base/Android.bp | 59 | ||||
-rw-r--r-- | transport/Android.bp | 92 | ||||
-rw-r--r-- | transport/HidlBinderSupport.cpp | 2 | ||||
-rw-r--r-- | transport/HidlPassthroughSupport.cpp | 2 | ||||
-rw-r--r-- | transport/Static.cpp | 2 |
6 files changed, 96 insertions, 170 deletions
@@ -50,7 +50,10 @@ cc_test { "libutils", "libcutils", ], - static_libs: ["libgtest", "libgmock"], + static_libs: [ + "libgtest", + "libgmock", + ], cflags: [ "-O0", @@ -58,21 +61,6 @@ cc_test { ], } -cc_defaults { - name: "libhidlbase-combined-impl", - - defaults: [ - "libhwbinder-impl-shared-libs", - "libhidlbase-impl-shared-libs", - "libhidltransport-impl-shared-libs", - ], - - whole_static_libs: [ - "libhidlbase-impl-internal", - "libhidltransport-impl-internal", - ], -} - cc_library { name: "libhidlbase", defaults: ["libhidlbase-combined-impl"], @@ -114,3 +102,92 @@ cc_library { visibility: [":__subpackages__"], } + +cc_defaults { + name: "libhidlbase-combined-impl", + + defaults: [ + "hidl-module-defaults", + "libhidl-defaults", + "libhwbinder-impl-shared-libs", + ], + + shared_libs: [ + "libbase", + "liblog", + "libutils", + "libcutils", + ], + export_shared_lib_headers: [ + "libcutils", // for native_handle.h + "libutils", + ], + static_libs: [ + "libhwbinder-impl-internal", + ], + + target: { + android: { + shared_libs: [ + "libvndksupport", + ], + }, + recovery: { + exclude_shared_libs: [ + "libvndksupport", + ], + }, + }, + + export_include_dirs: [ + "base/include", + "transport/include", + ], + + generated_sources: [ + "android.hidl.manager@1.0_genc++", + "android.hidl.manager@1.1_genc++", + "android.hidl.manager@1.2_genc++", + "android.hidl.base@1.0_genc++", + ], + generated_headers: [ + "android.hidl.manager@1.0_genc++_headers", + "android.hidl.manager@1.1_genc++_headers", + "android.hidl.manager@1.2_genc++_headers", + "android.hidl.base@1.0_genc++_headers", + ], + export_generated_headers: [ + "android.hidl.manager@1.0_genc++_headers", + "android.hidl.manager@1.1_genc++_headers", + "android.hidl.manager@1.2_genc++_headers", + "android.hidl.base@1.0_genc++_headers", + ], + + srcs: [ + "base/HidlInternal.cpp", + "base/HidlSupport.cpp", + "base/Status.cpp", + "base/TaskRunner.cpp", + "transport/HidlBinderSupport.cpp", + "transport/HidlLazyUtils.cpp", + "transport/HidlPassthroughSupport.cpp", + "transport/HidlTransportSupport.cpp", + "transport/HidlTransportUtils.cpp", + "transport/LegacySupport.cpp", + "transport/ServiceManagement.cpp", + "transport/Static.cpp", + ], + + product_variables: { + debuggable: { + cflags: ["-DLIBHIDL_TARGET_DEBUGGABLE"], + }, + enforce_vintf_manifest: { + cflags: ["-DENFORCE_VINTF_MANIFEST"], + }, + }, + + sanitize: { + misc_undefined: ["integer"], + }, +} diff --git a/base/Android.bp b/base/Android.bp deleted file mode 100644 index ca4e259..0000000 --- a/base/Android.bp +++ /dev/null @@ -1,59 +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. - -cc_defaults { - name: "libhidlbase-impl-shared-libs", - shared_libs: [ - "libbase", - "libcutils", - "liblog", - "libutils", - ], - export_shared_lib_headers: [ - "libutils", - "libcutils", // for native_handle.h - ], -} - -cc_library { - name: "libhidlbase-impl-internal", - host_supported: true, - recovery_available: true, - vendor_available: true, - defaults: [ - "libhidlbase-impl-shared-libs", - "libhidl-defaults" - ], - local_include_dirs: ["include"], - export_include_dirs: ["include"], - - sanitize: { - misc_undefined: ["integer"], - }, - - srcs: [ - "HidlInternal.cpp", - "HidlSupport.cpp", - "Status.cpp", - "TaskRunner.cpp", - ], - - product_variables: { - debuggable: { - cflags: ["-DLIBHIDL_TARGET_DEBUGGABLE"], - }, - }, - - visibility: ["//system/libhidl:__subpackages__"], -} diff --git a/transport/Android.bp b/transport/Android.bp index 2d5d88c..86603ee 100644 --- a/transport/Android.bp +++ b/transport/Android.bp @@ -15,95 +15,3 @@ hidl_package_root { name: "android.hidl", } - -cc_defaults { - name: "libhidltransport-impl-shared-libs", - shared_libs: [ - "libbase", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libutils", - ], - static_libs: [ - "libhwbinder-impl-internal", - ], - - target: { - android: { - shared_libs: [ - "libvndksupport", - ], - }, - recovery: { - exclude_shared_libs: [ - "libvndksupport", - ], - }, - }, -} - -cc_library_static { - name: "libhidltransport-impl-internal", - host_supported: true, - vendor_available: true, - recovery_available: true, - - defaults: [ - "hidl-module-defaults", - "libhidl-defaults", - "libhidltransport-impl-shared-libs", - ], - - static_libs: [ - "libhidlbase-impl-internal", - ], - export_static_lib_headers: [ - "libhidlbase-impl-internal", - ], - - export_include_dirs: ["include"], - - generated_sources: [ - "android.hidl.manager@1.0_genc++", - "android.hidl.manager@1.1_genc++", - "android.hidl.manager@1.2_genc++", - "android.hidl.base@1.0_genc++" - ], - generated_headers: [ - "android.hidl.manager@1.0_genc++_headers", - "android.hidl.manager@1.1_genc++_headers", - "android.hidl.manager@1.2_genc++_headers", - "android.hidl.base@1.0_genc++_headers" - ], - export_generated_headers: [ - "android.hidl.manager@1.0_genc++_headers", - "android.hidl.manager@1.1_genc++_headers", - "android.hidl.manager@1.2_genc++_headers", - "android.hidl.base@1.0_genc++_headers" - ], - - srcs: [ - "HidlBinderSupport.cpp", - "HidlLazyUtils.cpp", - "HidlPassthroughSupport.cpp", - "HidlTransportSupport.cpp", - "HidlTransportUtils.cpp", - "LegacySupport.cpp", - "ServiceManagement.cpp", - "Static.cpp" - ], - - product_variables: { - debuggable: { - cflags: ["-DLIBHIDL_TARGET_DEBUGGABLE"], - }, - enforce_vintf_manifest: { - cflags: ["-DENFORCE_VINTF_MANIFEST"] - }, - }, - - visibility: ["//system/libhidl:__subpackages__"], -} diff --git a/transport/HidlBinderSupport.cpp b/transport/HidlBinderSupport.cpp index 02d10d0..89b3a24 100644 --- a/transport/HidlBinderSupport.cpp +++ b/transport/HidlBinderSupport.cpp @@ -18,9 +18,9 @@ #include <hidl/HidlBinderSupport.h> -#include <InternalStatic.h> // TODO(b/69122224): remove this include, for getOrCreateCachedBinder #include <android/hidl/base/1.0/BpHwBase.h> #include <hwbinder/IPCThreadState.h> +#include "InternalStatic.h" // TODO(b/69122224): remove this include, for getOrCreateCachedBinder // C includes #include <inttypes.h> diff --git a/transport/HidlPassthroughSupport.cpp b/transport/HidlPassthroughSupport.cpp index bc67656..6f30b7b 100644 --- a/transport/HidlPassthroughSupport.cpp +++ b/transport/HidlPassthroughSupport.cpp @@ -16,7 +16,7 @@ #include <hidl/HidlPassthroughSupport.h> -#include <InternalStatic.h> // TODO(b/69122224): remove this include, for tryWrap +#include "InternalStatic.h" // TODO(b/69122224): remove this include, for tryWrap #include <hidl/HidlTransportUtils.h> #include <hidl/Static.h> diff --git a/transport/Static.cpp b/transport/Static.cpp index af16e8f..240d196 100644 --- a/transport/Static.cpp +++ b/transport/Static.cpp @@ -17,8 +17,8 @@ // All static variables go here, to control initialization and // destruction order in the library. -#include <InternalStatic.h> #include <hidl/Static.h> +#include "InternalStatic.h" #include <android/hidl/manager/1.0/IServiceManager.h> #include <utils/Mutex.h> |