commit 422e95d359fced4defa0c449f64b94fdefb84eba
author Sen Jiang <senj@google.com> Mon Jan 07 12:46:12 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 07 12:46:12 2019 -0800
tree fa306e6af3f0cabda0f48bbd68c3a16f12785581
parent 09cde657c9b0655734f1fb90e11363ef5696f456
parent a13b468459ab7c7319e2a763b0f357533686c99f

Merge aosp/upstream-master into aosp/master. am: 3ce4e526ee am: d0dc807a6b
am: a13b468459

Change-Id: I8f64f82dc3a7aad047afe0a6a244d431e9769caa

Android.bp

diff --git a/Android.bp b/Android.bp
index 906731f..24493b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -723,3 +723,12 @@
         },
     },
 }
+
+// AIDL interface between libupdate_engine and the Things jar.
+filegroup {
+    name: "things_update_engine_aidl",
+    srcs: [
+        "binder_bindings/android/brillo/IUpdateEngine.aidl",
+        "binder_bindings/android/brillo/IUpdateEngineStatusCallback.aidl",
+    ],
+}