diff options
| author | Divya Sharma <divyash@codeaurora.org> | 2017-06-26 15:31:39 -0700 |
|---|---|---|
| committer | Divya Sharma <divyash@codeaurora.org> | 2017-06-26 16:29:07 -0700 |
| commit | 694cdb170b1b4f0c916c21077a9207c20ee91838 (patch) | |
| tree | 5c3ecc28dff59dc56e41af2383662b408e8cfce2 /libstagefrighthw | |
| parent | 50eb38941d363620aa10c28540eefff9cda6ed17 (diff) | |
| parent | 52fb778abd86b372b8b4344fa06c31a6cba20675 (diff) | |
| download | media-694cdb170b1b4f0c916c21077a9207c20ee91838.tar.gz | |
Merge tag 'AU_LINUX_ANDROID_LA.UM.6.3.06.00.01.266.138' into HEAD
Conflicts:
libc2dcolorconvert/Android.mk
libstagefrighthw/Android.mk
mm-core/Android.mk
mm-video-v4l2/vidc/vdec/Android.mk
mm-video-v4l2/vidc/venc/Android.mk
mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
Change-Id: I62452320f642bbbdf697601cd60ab8637f436dc9
Diffstat (limited to 'libstagefrighthw')
| -rwxr-xr-x[-rw-r--r--] | libstagefrighthw/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index bf253db0..4979a21f 100644..100755 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -50,8 +50,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libstagefrighthw -LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib -LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 +LOCAL_VENDOR_MODULE := true include $(BUILD_SHARED_LIBRARY) |