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

Commit 3b1cac15 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

Merge "Remove unnecessary dynamic dependency on libbase." 

am: 0b4d4826

Change-Id: Idac5385600f54d80294220ce9571b3cd0d12e46d
parents 9b472034 0b4d4826

libnativebridge/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ cc_library { 


    host_supported: true,

    srcs: ["native_bridge.cc"],

    header_libs: [

        "libbase_headers",

    ],

    shared_libs: [

        "liblog",

        "libbase",

    ],



    export_include_dirs: ["include"],

libnativebridge/tests/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ test_src_files := \ 


shared_libraries := \

    liblog \

    libbase \

    libnativebridge \

    libnativebridge-dummy



header_libraries := \

    libbase_headers



libnativebridge_tests_common_cflags := \

    -Wall \

    -Werror \
@@ -40,6 +42,7 @@ libnativebridge_tests_common_cflags := \ 
$(foreach file,$(test_src_files), \

    $(eval include $(CLEAR_VARS)) \

    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \

    $(eval LOCAL_HEADER_LIBRARIES := $(header_libraries)) \

    $(eval LOCAL_SRC_FILES := $(file)) \

    $(eval LOCAL_CFLAGS := $(libnativebridge_tests_common_cflags)) \

    $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
@@ -49,6 +52,7 @@ $(foreach file,$(test_src_files), \ 
$(foreach file,$(test_src_files), \

    $(eval include $(CLEAR_VARS)) \

    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \

    $(eval LOCAL_HEADER_LIBRARIES := $(header_libraries)) \

    $(eval LOCAL_SRC_FILES := $(file)) \

    $(eval LOCAL_CFLAGS := $(libnativebridge_tests_common_cflags)) \

    $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \