Update makefiles for Soong plugin.
Test: manual
Bug: 35570956
Change-Id: I9ff98530878d0067a2a961b17276ac97b2cd9691
diff --git a/transport/Android.bp b/transport/Android.bp
index 4821560..f4ca01c 100644
--- a/transport/Android.bp
+++ b/transport/Android.bp
@@ -25,6 +25,11 @@
"token/1.0/utils",
]
+hidl_package_root {
+ name: "android.hidl",
+ path: "system/libhidl/transport",
+}
+
cc_library {
name: "libhidltransport",
vendor_available: true,
diff --git a/transport/allocator/1.0/Android.bp b/transport/allocator/1.0/Android.bp
index f02d1d1..a3d885a 100644
--- a/transport/allocator/1.0/Android.bp
+++ b/transport/allocator/1.0/Android.bp
@@ -1,141 +1,17 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hidl.allocator@1.0_hal",
- srcs: [
- "IAllocator.hal",
- ],
-}
-
-genrule {
- name: "android.hidl.allocator@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
- srcs: [
- ":android.hidl.allocator@1.0_hal",
- ],
- out: [
- "android/hidl/allocator/1.0/AllocatorAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.allocator@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
- srcs: [
- ":android.hidl.allocator@1.0_hal",
- ],
- out: [
- "android/hidl/allocator/1.0/IAllocator.h",
- "android/hidl/allocator/1.0/IHwAllocator.h",
- "android/hidl/allocator/1.0/BnHwAllocator.h",
- "android/hidl/allocator/1.0/BpHwAllocator.h",
- "android/hidl/allocator/1.0/BsAllocator.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.hidl.allocator@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.allocator@1.0_genc++"],
- generated_headers: ["android.hidl.allocator@1.0_genc++_headers"],
- export_generated_headers: ["android.hidl.allocator@1.0_genc++_headers"],
- vendor_available: true,
+ root: "android.hidl",
vndk: {
enabled: true,
},
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- ],
-}
-
-// This package is not java compatible. Not creating java target.
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hidl.allocator@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
srcs: [
- ":android.hidl.allocator@1.0_hal",
+ "IAllocator.hal",
],
- out: [
- "android/hidl/allocator/1.0/AAllocator.cpp",
+ interfaces: [
+ "android.hidl.base@1.0",
],
+ gen_java: false,
}
-genrule {
- name: "android.hidl.allocator@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
- srcs: [
- ":android.hidl.allocator@1.0_hal",
- ],
- out: [
- "android/hidl/allocator/1.0/AAllocator.h",
- ],
-}
-
-cc_library {
- name: "android.hidl.allocator@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.allocator@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hidl.allocator@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hidl.allocator@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hidl.allocator@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hidl.allocator@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hidl.allocator@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hidl:system/libhidl/transport android.hidl.allocator@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hidl.allocator@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hidl.allocator@1.0",
- "android.hidl.allocator@1.0-adapter-helper",
- ],
- generated_sources: ["android.hidl.allocator@1.0-adapter_genc++"],
-}
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index 73ee5cf..bd2ae49 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -1,137 +1,19 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hidl.base@1.0_hal",
+hidl_interface {
+ name: "android.hidl.base@1.0",
+ root: "android.hidl",
+ core_interface: true,
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IBase.hal",
],
+ types: [
+ "DebugInfo",
+ ],
+ gen_java: true,
}
-genrule {
- name: "android.hidl.base@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
- srcs: [
- ":android.hidl.base@1.0_hal",
- ],
- out: [
- "android/hidl/base/1.0/types.cpp",
- "android/hidl/base/1.0/BaseAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.base@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
- srcs: [
- ":android.hidl.base@1.0_hal",
- ],
- out: [
- "android/hidl/base/1.0/types.h",
- "android/hidl/base/1.0/hwtypes.h",
- "android/hidl/base/1.0/IBase.h",
- "android/hidl/base/1.0/IHwBase.h",
- "android/hidl/base/1.0/BnHwBase.h",
- "android/hidl/base/1.0/BpHwBase.h",
- "android/hidl/base/1.0/BsBase.h",
- ],
-}
-
-// android.hidl.base@1.0 is exported from libhidltransport
-
-genrule {
- name: "android.hidl.base-V1.0-java_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
- srcs: [
- ":android.hidl.base@1.0_hal",
- ],
- out: [
- "android/hidl/base/V1_0/DebugInfo.java",
- "android/hidl/base/V1_0/IBase.java",
- ],
-}
-
-java_library {
- name: "android.hidl.base-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hidl.base-V1.0-java_gen_java"],
- libs: [
- "hwbinder",
- ]
-}
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hidl.base@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
- srcs: [
- ":android.hidl.base@1.0_hal",
- ],
- out: [
- "android/hidl/base/1.0/ABase.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.base@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
- srcs: [
- ":android.hidl.base@1.0_hal",
- ],
- out: [
- "android/hidl/base/1.0/ABase.h",
- ],
-}
-
-cc_library {
- name: "android.hidl.base@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.base@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hidl.base@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hidl.base@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- ],
-}
-
-genrule {
- name: "android.hidl.base@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hidl:system/libhidl/transport android.hidl.base@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hidl.base@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hidl.base@1.0-adapter-helper",
- ],
- generated_sources: ["android.hidl.base@1.0-adapter_genc++"],
-}
diff --git a/transport/manager/1.0/Android.bp b/transport/manager/1.0/Android.bp
index a0898d7..e4a120b 100644
--- a/transport/manager/1.0/Android.bp
+++ b/transport/manager/1.0/Android.bp
@@ -1,145 +1,19 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hidl.manager@1.0_hal",
+hidl_interface {
+ name: "android.hidl.manager@1.0",
+ root: "android.hidl",
+ core_interface: true,
+ vndk: {
+ enabled: true,
+ },
srcs: [
"IServiceManager.hal",
"IServiceNotification.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ gen_java: true,
}
-genrule {
- name: "android.hidl.manager@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
- srcs: [
- ":android.hidl.manager@1.0_hal",
- ],
- out: [
- "android/hidl/manager/1.0/ServiceManagerAll.cpp",
- "android/hidl/manager/1.0/ServiceNotificationAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.manager@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
- srcs: [
- ":android.hidl.manager@1.0_hal",
- ],
- out: [
- "android/hidl/manager/1.0/IServiceManager.h",
- "android/hidl/manager/1.0/IHwServiceManager.h",
- "android/hidl/manager/1.0/BnHwServiceManager.h",
- "android/hidl/manager/1.0/BpHwServiceManager.h",
- "android/hidl/manager/1.0/BsServiceManager.h",
- "android/hidl/manager/1.0/IServiceNotification.h",
- "android/hidl/manager/1.0/IHwServiceNotification.h",
- "android/hidl/manager/1.0/BnHwServiceNotification.h",
- "android/hidl/manager/1.0/BpHwServiceNotification.h",
- "android/hidl/manager/1.0/BsServiceNotification.h",
- ],
-}
-
-// android.hidl.manager@1.0 is exported from libhidltransport
-
-genrule {
- name: "android.hidl.manager-V1.0-java_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
- srcs: [
- ":android.hidl.manager@1.0_hal",
- ],
- out: [
- "android/hidl/manager/V1_0/IServiceManager.java",
- "android/hidl/manager/V1_0/IServiceNotification.java",
- ],
-}
-
-java_library {
- name: "android.hidl.manager-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hidl.manager-V1.0-java_gen_java"],
- libs: [
- "hwbinder",
- "android.hidl.base-V1.0-java",
- ]
-}
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hidl.manager@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
- srcs: [
- ":android.hidl.manager@1.0_hal",
- ],
- out: [
- "android/hidl/manager/1.0/AServiceManager.cpp",
- "android/hidl/manager/1.0/AServiceNotification.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.manager@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
- srcs: [
- ":android.hidl.manager@1.0_hal",
- ],
- out: [
- "android/hidl/manager/1.0/AServiceManager.h",
- "android/hidl/manager/1.0/AServiceNotification.h",
- ],
-}
-
-cc_library {
- name: "android.hidl.manager@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.manager@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hidl.manager@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hidl.manager@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hidl.manager@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hidl:system/libhidl/transport android.hidl.manager@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hidl.manager@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hidl.manager@1.0-adapter-helper",
- ],
- generated_sources: ["android.hidl.manager@1.0-adapter_genc++"],
-}
diff --git a/transport/manager/1.1/Android.bp b/transport/manager/1.1/Android.bp
index 7a4094e..cde68a7 100644
--- a/transport/manager/1.1/Android.bp
+++ b/transport/manager/1.1/Android.bp
@@ -1,138 +1,19 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hidl.manager@1.1_hal",
+hidl_interface {
+ name: "android.hidl.manager@1.1",
+ root: "android.hidl",
+ core_interface: true,
+ vndk: {
+ enabled: true,
+ },
srcs: [
"IServiceManager.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ "android.hidl.manager@1.0",
+ ],
+ gen_java: true,
}
-genrule {
- name: "android.hidl.manager@1.1_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.manager@1.1",
- srcs: [
- ":android.hidl.manager@1.1_hal",
- ],
- out: [
- "android/hidl/manager/1.1/ServiceManagerAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.manager@1.1_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.manager@1.1",
- srcs: [
- ":android.hidl.manager@1.1_hal",
- ],
- out: [
- "android/hidl/manager/1.1/IServiceManager.h",
- "android/hidl/manager/1.1/IHwServiceManager.h",
- "android/hidl/manager/1.1/BnHwServiceManager.h",
- "android/hidl/manager/1.1/BpHwServiceManager.h",
- "android/hidl/manager/1.1/BsServiceManager.h",
- ],
-}
-
-// android.hidl.manager@1.1 is exported from libhidltransport
-
-genrule {
- name: "android.hidl.manager-V1.1-java_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hidl:system/libhidl/transport android.hidl.manager@1.1",
- srcs: [
- ":android.hidl.manager@1.1_hal",
- ],
- out: [
- "android/hidl/manager/V1_1/IServiceManager.java",
- ],
-}
-
-java_library {
- name: "android.hidl.manager-V1.1-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hidl.manager-V1.1-java_gen_java"],
- libs: [
- "hwbinder",
- "android.hidl.base-V1.0-java",
- "android.hidl.manager-V1.0-java",
- ]
-}
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hidl.manager@1.1-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport android.hidl.manager@1.1",
- srcs: [
- ":android.hidl.manager@1.1_hal",
- ],
- out: [
- "android/hidl/manager/1.1/AServiceManager.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.manager@1.1-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hidl:system/libhidl/transport android.hidl.manager@1.1",
- srcs: [
- ":android.hidl.manager@1.1_hal",
- ],
- out: [
- "android/hidl/manager/1.1/AServiceManager.h",
- ],
-}
-
-cc_library {
- name: "android.hidl.manager@1.1-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.manager@1.1-adapter-helper_genc++"],
- generated_headers: ["android.hidl.manager@1.1-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hidl.manager@1.1-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hidl.base@1.0-adapter-helper",
- "android.hidl.manager@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hidl.base@1.0-adapter-helper",
- "android.hidl.manager@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hidl.manager@1.1-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hidl:system/libhidl/transport android.hidl.manager@1.1",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hidl.manager@1.1-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hidl.manager@1.1-adapter-helper",
- ],
- generated_sources: ["android.hidl.manager@1.1-adapter_genc++"],
-}
diff --git a/transport/memory/1.0/Android.bp b/transport/memory/1.0/Android.bp
index cf24616..eaa3037 100644
--- a/transport/memory/1.0/Android.bp
+++ b/transport/memory/1.0/Android.bp
@@ -1,151 +1,19 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hidl.memory@1.0_hal",
- srcs: [
- "IMapper.hal",
- "IMemory.hal",
- ],
-}
-
-genrule {
- name: "android.hidl.memory@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
- srcs: [
- ":android.hidl.memory@1.0_hal",
- ],
- out: [
- "android/hidl/memory/1.0/MapperAll.cpp",
- "android/hidl/memory/1.0/MemoryAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.memory@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
- srcs: [
- ":android.hidl.memory@1.0_hal",
- ],
- out: [
- "android/hidl/memory/1.0/IMapper.h",
- "android/hidl/memory/1.0/IHwMapper.h",
- "android/hidl/memory/1.0/BnHwMapper.h",
- "android/hidl/memory/1.0/BpHwMapper.h",
- "android/hidl/memory/1.0/BsMapper.h",
- "android/hidl/memory/1.0/IMemory.h",
- "android/hidl/memory/1.0/IHwMemory.h",
- "android/hidl/memory/1.0/BnHwMemory.h",
- "android/hidl/memory/1.0/BpHwMemory.h",
- "android/hidl/memory/1.0/BsMemory.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.hidl.memory@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.memory@1.0_genc++"],
- generated_headers: ["android.hidl.memory@1.0_genc++_headers"],
- export_generated_headers: ["android.hidl.memory@1.0_genc++_headers"],
- vendor_available: true,
+ root: "android.hidl",
vndk: {
enabled: true,
support_system_process: true,
},
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- ],
-}
-
-// This package is not java compatible. Not creating java target.
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hidl.memory@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
srcs: [
- ":android.hidl.memory@1.0_hal",
+ "IMapper.hal",
+ "IMemory.hal",
],
- out: [
- "android/hidl/memory/1.0/AMapper.cpp",
- "android/hidl/memory/1.0/AMemory.cpp",
+ interfaces: [
+ "android.hidl.base@1.0",
],
+ gen_java: false,
}
-genrule {
- name: "android.hidl.memory@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
- srcs: [
- ":android.hidl.memory@1.0_hal",
- ],
- out: [
- "android/hidl/memory/1.0/AMapper.h",
- "android/hidl/memory/1.0/AMemory.h",
- ],
-}
-
-cc_library {
- name: "android.hidl.memory@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.memory@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hidl.memory@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hidl.memory@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hidl.memory@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hidl.memory@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hidl.memory@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hidl:system/libhidl/transport android.hidl.memory@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hidl.memory@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hidl.memory@1.0",
- "android.hidl.memory@1.0-adapter-helper",
- ],
- generated_sources: ["android.hidl.memory@1.0-adapter_genc++"],
-}
diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index 1bc6d97..c0988cb 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -1,162 +1,17 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hidl.token@1.0_hal",
- srcs: [
- "ITokenManager.hal",
- ],
-}
-
-genrule {
- name: "android.hidl.token@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
- srcs: [
- ":android.hidl.token@1.0_hal",
- ],
- out: [
- "android/hidl/token/1.0/TokenManagerAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.token@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
- srcs: [
- ":android.hidl.token@1.0_hal",
- ],
- out: [
- "android/hidl/token/1.0/ITokenManager.h",
- "android/hidl/token/1.0/IHwTokenManager.h",
- "android/hidl/token/1.0/BnHwTokenManager.h",
- "android/hidl/token/1.0/BpHwTokenManager.h",
- "android/hidl/token/1.0/BsTokenManager.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.hidl.token@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.token@1.0_genc++"],
- generated_headers: ["android.hidl.token@1.0_genc++_headers"],
- export_generated_headers: ["android.hidl.token@1.0_genc++_headers"],
- vendor_available: true,
+ root: "android.hidl",
vndk: {
enabled: true,
},
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- ],
-}
-
-genrule {
- name: "android.hidl.token-V1.0-java_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
srcs: [
- ":android.hidl.token@1.0_hal",
+ "ITokenManager.hal",
],
- out: [
- "android/hidl/token/V1_0/ITokenManager.java",
+ interfaces: [
+ "android.hidl.base@1.0",
],
+ gen_java: true,
}
-java_library {
- name: "android.hidl.token-V1.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hidl.token-V1.0-java_gen_java"],
- libs: [
- "hwbinder",
- "android.hidl.base-V1.0-java",
- ]
-}
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hidl.token@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
- srcs: [
- ":android.hidl.token@1.0_hal",
- ],
- out: [
- "android/hidl/token/1.0/ATokenManager.cpp",
- ],
-}
-
-genrule {
- name: "android.hidl.token@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
- srcs: [
- ":android.hidl.token@1.0_hal",
- ],
- out: [
- "android/hidl/token/1.0/ATokenManager.h",
- ],
-}
-
-cc_library {
- name: "android.hidl.token@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hidl.token@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hidl.token@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hidl.token@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hidl.token@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hidl.token@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hidl.token@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hidl.token@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hidl.token@1.0",
- "android.hidl.token@1.0-adapter-helper",
- ],
- generated_sources: ["android.hidl.token@1.0-adapter_genc++"],
-}