Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp
index 4ca82b2..878b594 100644
--- a/audio/common/2.0/Android.bp
+++ b/audio/common/2.0/Android.bp
@@ -1,81 +1,48 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.audio.common@2.0_hal",
- srcs: [
- "types.hal",
- ],
-}
-
-genrule {
- name: "android.hardware.audio.common@2.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
- srcs: [
- ":android.hardware.audio.common@2.0_hal",
- ],
- out: [
- "android/hardware/audio/common/2.0/types.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.audio.common@2.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
- srcs: [
- ":android.hardware.audio.common@2.0_hal",
- ],
- out: [
- "android/hardware/audio/common/2.0/types.h",
- "android/hardware/audio/common/2.0/hwtypes.h",
- ],
-}
-
-cc_library {
+hidl_interface {
name: "android.hardware.audio.common@2.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.audio.common@2.0_genc++"],
- generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],
- vendor_available: true,
+ root: "android.hardware",
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.
-
-genrule {
- name: "android.hardware.audio.common-V2.0-java-constants_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.common@2.0",
srcs: [
- ":android.hardware.audio.common@2.0_hal",
+ "types.hal",
],
- out: [
- "android/hardware/audio/common/V2_0/Constants.java",
+ types: [
+ "AudioChannelMask",
+ "AudioConfig",
+ "AudioDevice",
+ "AudioFormat",
+ "AudioGain",
+ "AudioGainConfig",
+ "AudioGainMode",
+ "AudioHandleConsts",
+ "AudioInputFlag",
+ "AudioInterleave",
+ "AudioMixLatencyClass",
+ "AudioMode",
+ "AudioOffloadInfo",
+ "AudioOutputFlag",
+ "AudioPort",
+ "AudioPortConfig",
+ "AudioPortConfigDeviceExt",
+ "AudioPortConfigMask",
+ "AudioPortConfigSessionExt",
+ "AudioPortDeviceExt",
+ "AudioPortMixExt",
+ "AudioPortRole",
+ "AudioPortSessionExt",
+ "AudioPortType",
+ "AudioSessionConsts",
+ "AudioSource",
+ "AudioStreamType",
+ "AudioUsage",
+ "FixedChannelCount",
+ "ThreadInfo",
+ "Uuid",
],
+ gen_java: false,
+ gen_java_constants: true,
}
-java_library {
- name: "android.hardware.audio.common-V2.0-java-constants",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.audio.common-V2.0-java-constants_gen_java"],
-}
-// This package has no interfaces. Not creating versioning adapter.