summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2019-06-14 16:18:57 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-14 16:18:57 -0700
commit6fcb1736edbfd34bceb0143c2c7e50dc8c67df10 (patch)
treea7d75fa346197ecdad520d7391a9c0c4cae043bf /base
parent03ed70352228dd313b9b7305004d8d1d477ed9fd (diff)
parenta46371d5b3ffd08808ae93ec420721345738ec65 (diff)
downloadlibhidl-6fcb1736edbfd34bceb0143c2c7e50dc8c67df10.tar.gz
Combine libhidlbase/libhidltransport into one lib.
am: a46371d5b3 Change-Id: Id851f2f0de31ac26f89e3b058b4d412678f1c0e5
Diffstat (limited to 'base')
-rw-r--r--base/Android.bp21
1 files changed, 12 insertions, 9 deletions
diff --git a/base/Android.bp b/base/Android.bp
index 359ac91..8fe2702 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -12,15 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-cc_library {
- name: "libhidlbase",
- recovery_available: true,
- vendor_available: true,
- vndk: {
- enabled: true,
- support_system_process: true,
- },
- defaults: ["libhidl-defaults"],
+cc_defaults {
+ name: "libhidlbase-impl-shared-libs",
shared_libs: [
"libbase",
"libcutils",
@@ -31,6 +24,16 @@ cc_library {
"libutils",
"libcutils", // for native_handle.h
],
+}
+
+cc_library {
+ name: "libhidlbase-impl-internal",
+ vendor_available: true,
+ recovery_available: true,
+ defaults: [
+ "libhidlbase-impl-shared-libs",
+ "libhidl-defaults"
+ ],
local_include_dirs: ["include"],
export_include_dirs: ["include"],