From 941f105b60c997eb9deee78b98f2dce3ea90b258 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Tue, 5 Feb 2019 13:14:05 -0800
Subject: [PATCH] Update makefiles.

Some of these are out of date.

Bug: N/A
Test: N/A
Change-Id: Ibf87fad9981d4e430a0bf797feadbb0bede232fc
---
 audio/5.0/Android.bp           | 4 ----
 audio/common/5.0/Android.bp    | 4 ++++
 bluetooth/audio/2.0/Android.bp | 5 ++++-
 neuralnetworks/1.2/Android.bp  | 3 +++
 radio/1.3/Android.bp           | 4 ++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/audio/5.0/Android.bp b/audio/5.0/Android.bp
index 27c1ef5f5e..ee023e3821 100644
--- a/audio/5.0/Android.bp
+++ b/audio/5.0/Android.bp
@@ -35,11 +35,7 @@ hidl_interface {
         "MmapBufferInfo",
         "MmapPosition",
         "ParameterValue",
-        "PlaybackTrackMetadata",
-        "RecordTrackMetadata",
         "Result",
-        "SinkMetadata",
-        "SourceMetadata",
         "TimeSpec",
     ],
     gen_java: false,
diff --git a/audio/common/5.0/Android.bp b/audio/common/5.0/Android.bp
index 663f8470f9..c17f1442c6 100644
--- a/audio/common/5.0/Android.bp
+++ b/audio/common/5.0/Android.bp
@@ -39,6 +39,10 @@ hidl_interface {
         "AudioStreamType",
         "AudioUsage",
         "FixedChannelCount",
+        "PlaybackTrackMetadata",
+        "RecordTrackMetadata",
+        "SinkMetadata",
+        "SourceMetadata",
         "ThreadInfo",
         "Uuid",
     ],
diff --git a/bluetooth/audio/2.0/Android.bp b/bluetooth/audio/2.0/Android.bp
index 5d67f75f04..542c812590 100644
--- a/bluetooth/audio/2.0/Android.bp
+++ b/bluetooth/audio/2.0/Android.bp
@@ -1,3 +1,5 @@
+// This file is autogenerated by hidl-gen -Landroidbp.
+
 hidl_interface {
     name: "android.hardware.bluetooth.audio@2.0",
     root: "android.hardware",
@@ -11,8 +13,8 @@ hidl_interface {
         "IBluetoothAudioProvidersFactory.hal",
     ],
     interfaces: [
-        "android.hidl.base@1.0",
         "android.hardware.audio.common@5.0",
+        "android.hidl.base@1.0",
     ],
     types: [
         "AacObjectType",
@@ -34,6 +36,7 @@ hidl_interface {
         "SbcAllocMethod",
         "SbcBlockLength",
         "SbcChannelMode",
+        "SbcNumSubbands",
         "SbcParameters",
         "SessionType",
         "Status",
diff --git a/neuralnetworks/1.2/Android.bp b/neuralnetworks/1.2/Android.bp
index 9057b9423b..0642dceb2e 100644
--- a/neuralnetworks/1.2/Android.bp
+++ b/neuralnetworks/1.2/Android.bp
@@ -22,9 +22,11 @@ hidl_interface {
         "android.hidl.safe_union@1.0",
     ],
     types: [
+        "Constant",
         "DeviceType",
         "FmqRequestDatum",
         "FmqResultDatum",
+        "MeasureTiming",
         "Model",
         "Operand",
         "OperandType",
@@ -34,6 +36,7 @@ hidl_interface {
         "OperationTypeRange",
         "OutputShape",
         "SymmPerChannelQuantParams",
+        "Timing",
     ],
     gen_java: false,
 }
diff --git a/radio/1.3/Android.bp b/radio/1.3/Android.bp
index 30b8edfda7..63056ccfbd 100644
--- a/radio/1.3/Android.bp
+++ b/radio/1.3/Android.bp
@@ -7,6 +7,7 @@ hidl_interface {
         enabled: true,
     },
     srcs: [
+        "types.hal",
         "IRadio.hal",
         "IRadioIndication.hal",
         "IRadioResponse.hal",
@@ -17,6 +18,9 @@ hidl_interface {
         "android.hardware.radio@1.2",
         "android.hidl.base@1.0",
     ],
+    types: [
+        "RadioResponseInfoModem",
+    ],
     gen_java: true,
 }