commit b3358a7f9b36f15314d8ffcfcb5107598c8b8cc6
author Jiyong Park <jiyong@google.com> Sat Apr 21 11:40:21 2018 +0900
committer Jiyong Park <jiyong@google.com> Sat Apr 21 11:40:21 2018 +0900
tree 8830c2f4cc67193df67ed5ace215189b89812d20
parent f4f01aafa5d45d2c5b1acb80bba9fcaa64e70e61
parent 1ec43c9c3e6a486cd2d1438f158eea1a27bb6007

resolve merge conflicts of 1ec43c9c3e6a486cd2d1438f158eea1a27bb6007 to pi-dev-plus-aosp

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia022f34c839539aab4a18ca331f22165d1abfaff

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 9d9ac8c..ba7003a 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -41,6 +41,7 @@
     vndk: {
         enabled: true,
     },
+    double_loadable: true,
 
     srcs: [
         "aidl/android/IGraphicBufferSource.aidl",

media/libstagefright/foundation/Android.bp

diff --git a/media/libstagefright/foundation/Android.bp b/media/libstagefright/foundation/Android.bp
index f663542..6b384c0 100644
--- a/media/libstagefright/foundation/Android.bp
+++ b/media/libstagefright/foundation/Android.bp
@@ -10,6 +10,7 @@
     vndk: {
         enabled: true,
     },
+    double_loadable: true,
     include_dirs: [
         "frameworks/av/include",
         "frameworks/native/include",