diff options
| author | Kevin Rocard <krocard@google.com> | 2017-12-15 12:56:47 -0800 |
|---|---|---|
| committer | Kevin Rocard <krocard@google.com> | 2018-01-20 10:49:57 -0800 |
| commit | cb9827c0723e7dd0e128a3d189a7ce62bfd0ff9b (patch) | |
| tree | c87255edba73b6a644389c610fdcbecb42ca91fa /audio/2.0 | |
| parent | 1ae0401179cbcfceef5ed78b5e4a11f14ffccc64 (diff) | |
| download | platform_hardware_interfaces-cb9827c0723e7dd0e128a3d189a7ce62bfd0ff9b.tar.gz platform_hardware_interfaces-cb9827c0723e7dd0e128a3d189a7ce62bfd0ff9b.tar.bz2 platform_hardware_interfaces-cb9827c0723e7dd0e128a3d189a7ce62bfd0ff9b.zip | |
Audio V4: Transition legacy wrapper to Android.bp
Bug: 38184704
Test: compile
Change-Id: I950b3c38e1ae8093414ce1054a8530047a81ccca
Signed-off-by: Kevin Rocard <krocard@google.com>
Diffstat (limited to 'audio/2.0')
| -rw-r--r-- | audio/2.0/default/Android.bp | 45 | ||||
| -rw-r--r-- | audio/2.0/default/Android.mk | 42 |
2 files changed, 47 insertions, 40 deletions
diff --git a/audio/2.0/default/Android.bp b/audio/2.0/default/Android.bp new file mode 100644 index 0000000000..4ad1aad223 --- /dev/null +++ b/audio/2.0/default/Android.bp @@ -0,0 +1,45 @@ +cc_library_shared { + name: "android.hardware.audio@2.0-impl", + relative_install_path: "hw", + proprietary: true, + vendor: true, + srcs: [ + "Conversions.cpp", + "Device.cpp", + "DevicesFactory.cpp", + "ParametersUtil.cpp", + "PrimaryDevice.cpp", + "Stream.cpp", + "StreamIn.cpp", + "StreamOut.cpp", + ], + + defaults: ["hidl_defaults"], + + shared_libs: [ + "libbase", + "libcutils", + "libfmq", + "libhardware", + "libhidlbase", + "libhidltransport", + "liblog", + "libutils", + "android.hardware.audio@2.0", + "android.hardware.audio.common@2.0", + "android.hardware.audio.common@2.0-util", + "android.hardware.audio.common-util", + ], + + header_libs: [ + "libaudioclient_headers", + "libaudio_system_headers", + "libhardware_headers", + "libmedia_headers", + ], + + whole_static_libs: [ + "libmedia_helper", + ], + +} diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk index ccf3c1c42f..c1f1a25ecc 100644 --- a/audio/2.0/default/Android.mk +++ b/audio/2.0/default/Android.mk @@ -16,46 +16,6 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.audio@2.0-impl -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_SRC_FILES := \ - Conversions.cpp \ - Device.cpp \ - DevicesFactory.cpp \ - ParametersUtil.cpp \ - PrimaryDevice.cpp \ - Stream.cpp \ - StreamIn.cpp \ - StreamOut.cpp \ - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libcutils \ - libfmq \ - libhardware \ - libhidlbase \ - libhidltransport \ - liblog \ - libutils \ - android.hardware.audio@2.0 \ - android.hardware.audio.common@2.0 \ - android.hardware.audio.common@2.0-util \ - android.hardware.audio.common-util \ - -LOCAL_HEADER_LIBRARIES := \ - libaudioclient_headers \ - libaudio_system_headers \ - libhardware_headers \ - libmedia_headers \ - -LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper - -include $(BUILD_SHARED_LIBRARY) - # # Service # @@ -83,6 +43,8 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.broadcastradio@1.0 \ android.hardware.broadcastradio@1.1 +# Can not switch to Android.bp until AUDIOSERVER_MULTILIB +# is deprecated as build config variable are not supported ifeq ($(strip $(AUDIOSERVER_MULTILIB)),) LOCAL_MULTILIB := 32 else |