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

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

Merge "Remove unnecessary dynamic dependency on libbase." am: 0b4d4826 

am: 3b1cac15

Change-Id: Icc1d5af3d02f75caa1b5d3dbc6d8c29d4373fec9
parents 82a731fe 3b1cac15

libnativebridge/Android.bp

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




    host_supported: true,

    host_supported: true,

    srcs: ["native_bridge.cc"],

    srcs: ["native_bridge.cc"],

    header_libs: [

        "libbase_headers",

    ],

    shared_libs: [

    shared_libs: [

        "liblog",

        "liblog",

        "libbase",

    ],

    ],





    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

libnativebridge/tests/Android.mk

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




shared_libraries := \

shared_libraries := \

    liblog \

    liblog \

    libbase \

    libnativebridge \

    libnativebridge \

    libnativebridge-dummy

    libnativebridge-dummy





header_libraries := \

    libbase_headers



libnativebridge_tests_common_cflags := \

libnativebridge_tests_common_cflags := \

    -Wall \

    -Wall \

    -Werror \

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

$(foreach file,$(test_src_files), \

    $(eval include $(CLEAR_VARS)) \

    $(eval include $(CLEAR_VARS)) \

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

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

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

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

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

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

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

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

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

$(foreach file,$(test_src_files), \

    $(eval include $(CLEAR_VARS)) \

    $(eval include $(CLEAR_VARS)) \

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

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

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

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

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

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

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

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

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