| commit | b4e0c3b19f11e972c9b789550c4e321cf26fa1c8 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Sep 27 10:21:55 2019 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Wed Oct 02 19:54:39 2019 +0000 |
| tree | 0b8ca8cb36cba24e658232e5fa0b286d75318995 | |
| parent | bcc132d8e562375f7830839caf84307f523f623d [diff] |
Remove libmediadrm symlinks Test: build Change-Id: I53d703b6d34226926437b0207a2b3d51dff6881a Merged-In: I53d703b6d34226926437b0207a2b3d51dff6881a
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp index b26398e..87aed41 100644 --- a/services/camera/libcameraservice/Android.bp +++ b/services/camera/libcameraservice/Android.bp
@@ -69,6 +69,10 @@ "utils/LatencyHistogram.cpp", ], + header_libs: [ + "libmediadrm_headers" + ], + shared_libs: [ "libbase", "libdl",
diff --git a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp index 5a87134..3d1235e 100644 --- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp +++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@@ -28,7 +28,7 @@ #include <utils/Log.h> #include <utils/Trace.h> -#include <media/ICrypto.h> +#include <mediadrm/ICrypto.h> #include <media/MediaCodecBuffer.h> #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/AMessage.h>