| commit | a56f7d26082aa8f56e9313b7812bd15ffd7f1c12 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:43 2020 +0000 |
| tree | e767a5328cb7aa5eb38af57f0af1ff70e7599830 | |
| parent | 6bc12b0352917c71d7c28823de760ad2fceafa7f [diff] | |
| parent | 789d1d0866b2d5772be3fc097cd7713201b20f9b [diff] |
[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours am: 789d1d0866 -s ours am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1422563 Change-Id: Ic319ade87dab6280b771d6f8d91d7bfde3a056fe
diff --git a/Android.bp b/Android.bp index 593dd27..4852fe4 100644 --- a/Android.bp +++ b/Android.bp
@@ -89,7 +89,7 @@ export_aidl_headers: true, }, whole_static_libs: [ - "libincremental_aidl-cpp", + "libincremental_aidl-unstable-cpp", ], }