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

Commit 13e2fda3 authored by Steven Moreland's avatar Steven Moreland
Browse files

Make libeffects build with the VNDK. 

When the vndk is enabled (BOARD_VNDK_VERSION=current),
vendor libraries must only link against vendor variants
in the build system. This also means that they receive
restricted sets of headers and that automatic global
headers are restricted.

Test: build libeffects with BOARD_VNDK_VERSION=current
Bug: 37342627
Change-Id: I95b4bc39eb98b5af4069ab64d81574a451c8131f
parent 2ca3dd33

media/libeffects/config/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -10,5 +10,8 @@ cc_library_shared { 
        "libtinyxml2",

    ],



    header_libs: ["libaudio_system_headers"],

    export_header_lib_headers: ["libaudio_system_headers"],



    export_include_dirs: ["include"],

}

media/libeffects/factory/Android.bp

+9 −7
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ cc_library_headers { 
cc_library_shared {

    name: "libeffects",

    vendor: true,

    srcs: ["EffectsFactory.c",

    srcs: [

         "EffectsFactory.c",

         "EffectsConfigLoader.c",

         "EffectsFactoryState.c",

         "EffectsXmlConfigLoader.cpp",
@@ -24,11 +25,12 @@ cc_library_shared { 
    ],

    cflags: ["-fvisibility=hidden"],



    include_dirs: ["system/media/audio_effects/include"],



    local_include_dirs:["include/media"],



    header_libs: ["libeffects_headers"],

    header_libs: [

        "libaudioeffects",

        "libeffects_headers",

    ],

    export_header_lib_headers: ["libeffects_headers"],

}

media/libeffects/factory/EffectsConfigLoader.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <dlfcn.h>

#include <stdlib.h>

#include <unistd.h>



#include <cutils/config_utils.h>

#include <cutils/misc.h>

media/libeffects/factory/EffectsFactory.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <dirent.h>

#include <pthread.h>



#include <android/log.h>

#include <cutils/compiler.h>

#include <hardware/audio_effect.h>