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

Commit 64050729 authored by Ray Essick's avatar Ray Essick
Browse files

replace include_dirs with header_libs 

use of include_dirs assumes a particular source structure, limiting
our ability to rearrange the source tree for other needs.

Bug: 201944383
Test: build, boot
Change-Id: Ia0e72f51c845a199adb33adf3832ae7089a26148
parent 2ea3d2e1

cmds/stagefright/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -227,8 +227,6 @@ cc_binary { 
        "rs-headers",

        "rs-headers",

    ],

    ],





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



    shared_libs: [

    shared_libs: [

        "libstagefright",

        "libstagefright",

        "liblog",

        "liblog",

media/libheif/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,5 @@ cc_library_shared { 
        "-Wall",

        "-Wall",

    ],

    ],





    include_dirs: [],



    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

}
 
}

media/libmediaplayerservice/Android.bp

+7 −4
Original line number Original line Diff line number Diff line
@@ -79,6 +79,9 @@ cc_library { 
        "libstagefright_nuplayer",

        "libstagefright_nuplayer",

        "libstagefright_rtsp",

        "libstagefright_rtsp",

        "libstagefright_timedtext",

        "libstagefright_timedtext",

        // this needs it, but it can get it transitively through libstagefright.

        // i'm going to leave it here.

        "libstagefright_webm",

        "framework-permission-aidl-cpp",

        "framework-permission-aidl-cpp",

    ],

    ],
@@ -91,12 +94,12 @@ cc_library { 
        "libmediautils_headers",

        "libmediautils_headers",

    ],

    ],





    include_dirs: [

        "frameworks/av/media/libstagefright/webm",

    ],



    local_include_dirs: ["include"],

    local_include_dirs: ["include"],





    export_include_dirs: [

        ".",

    ],



    cflags: [

    cflags: [

        "-Werror",

        "-Werror",

        "-Wno-error=deprecated-declarations",

        "-Wno-error=deprecated-declarations",

media/libmediaplayerservice/StagefrightRecorder.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,8 @@ 
#include <android-base/logging.h>

#include <android-base/logging.h>

#include <utils/Log.h>

#include <utils/Log.h>





#include "WebmWriter.h"

#include <webm/WebmWriter.h>



#include "StagefrightRecorder.h"

#include "StagefrightRecorder.h"





#include <algorithm>

#include <algorithm>

media/libmediaplayerservice/fuzzer/Android.bp

+0 −3
Original line number Original line Diff line number Diff line
@@ -28,9 +28,6 @@ package { 




cc_defaults {

cc_defaults {

    name: "libmediaplayerserviceFuzzer_defaults",

    name: "libmediaplayerserviceFuzzer_defaults",

    include_dirs: [

        "frameworks/av/media/libmediaplayerservice",

    ],

    static_libs: [

    static_libs: [

        "libmediaplayerservice",

        "libmediaplayerservice",

        "liblog",

        "liblog",