Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef6bd3e3 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Remove more header symlinks" am: a2bc7ead 

am: ec565c57

Change-Id: I6543832b9aeb3611d077c9e8775c0b7610bb97e2
parents a08a1544 ec565c57

camera/cameraserver/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ cc_binary { 


    srcs: ["main_cameraserver.cpp"],



    header_libs: [

        "libmedia_headers",

    ],



    shared_libs: [

        "libcameraservice",

        "liblog",

drm/libmediadrm/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ cc_library_shared { 
        "include"

    ],



    header_libs: [

        "libmedia_headers",

    ],



    shared_libs: [

        "libbinder",

        "libcutils",
@@ -75,6 +79,9 @@ cc_library_shared { 
        export_proto_headers: true,

        type: "lite",

    },

    header_libs: [

        "libmedia_headers",

    ],

    shared_libs: [

        "android.hardware.drm@1.0",

        "android.hardware.drm@1.1",
@@ -110,6 +117,9 @@ cc_library_shared { 
        export_proto_headers: true,

        type: "full",

    },

    header_libs: [

        "libmedia_headers",

    ],

    shared_libs: [

        "android.hardware.drm@1.0",

        "android.hardware.drm@1.1",

drm/libmediadrm/tests/Android.bp

+7 −3
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
cc_test {

    name: "CounterMetric_test",

    srcs: ["CounterMetric_test.cpp"],

    header_libs: ["libmedia_headers"],

    shared_libs: ["libmediadrm"],

    include_dirs: ["frameworks/av/include/media"],

    cflags: [

      "-Werror",

      "-Wall",
@@ -14,6 +14,9 @@ cc_test { 
cc_test {

    name: "DrmMetrics_test",

    srcs: ["DrmMetrics_test.cpp"],

    header_libs: [

        "libmedia_headers"

    ],

    shared_libs: [

      "android.hardware.drm@1.0",

      "android.hardware.drm@1.1",
@@ -29,7 +32,6 @@ cc_test { 
    static_libs: ["libgmock"],

    include_dirs: [

      "frameworks/av/drm/libmediadrm/include",

      "frameworks/av/include/media",

    ],

    cflags: [

        // Suppress unused parameter and no error options. These cause problems
@@ -41,12 +43,14 @@ cc_test { 
cc_test {

    name: "EventMetric_test",

    srcs: ["EventMetric_test.cpp"],

    header_libs: [

        "libmedia_headers"

    ],

    shared_libs: [

      "liblog",

      "libmediadrm",

      "libutils",

    ],

    include_dirs: ["frameworks/av/include/media"],

    cflags: [

      "-Werror",

      "-Wall",

drm/libmediadrm/tests/CounterMetric_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include <gtest/gtest.h>



#include "CounterMetric.h"

#include <media/CounterMetric.h>



namespace android {

drm/libmediadrm/tests/EventMetric_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include <gtest/gtest.h>



#include "EventMetric.h"

#include <media/EventMetric.h>



namespace android {