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

Commit da144256 authored by Zach Johnson's avatar Zach Johnson
Browse files

Move jni/Android.bp into Android.bp 

Bug: 142747680
Test: compile & run on device, test basic functionality working
Change-Id: I9dccd0b47e69762dc3f33ba7dffb8bc219e5cf49
parent 5aa4810a

android/app/Android.bp

+30 −5
Original line number Diff line number Diff line 
subdirs = [

    "jni",

]





// MAP API module



java_library {
@@ -11,6 +6,36 @@ java_library { 
    srcs: ["lib/mapapi/**/*.java"],

}



// Bluetooth JNI



cc_library_shared {

    name: "libbluetooth_jni",

    compile_multilib: "first",

    srcs: ["jni/**/*.cpp"],

    header_libs: ["libbluetooth_headers"],

    include_dirs: [

        "system/bt/types",

    ],

    shared_libs: [

        "libbase",

        "libchrome",

        "libnativehelper",

        "liblog",

    ],

    static_libs: [

        "libbluetooth-types",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

        "-Wno-unused-parameter",

    ],

    sanitize: {

        scs: true,

    },

}



// Bluetooth APK



android_app {

android/app/jni/Android.bp

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libbluetooth_jni",

    compile_multilib: "first",

    srcs: [

        "com_android_bluetooth_btservice_AdapterService.cpp",

        "com_android_bluetooth_hfp.cpp",

        "com_android_bluetooth_hfpclient.cpp",

        "com_android_bluetooth_a2dp.cpp",

        "com_android_bluetooth_a2dp_sink.cpp",

        "com_android_bluetooth_avrcp_controller.cpp",

        "com_android_bluetooth_avrcp_target.cpp",

        "com_android_bluetooth_hid_host.cpp",

        "com_android_bluetooth_hid_device.cpp",

        "com_android_bluetooth_hearing_aid.cpp",

        "com_android_bluetooth_pan.cpp",

        "com_android_bluetooth_gatt.cpp",

        "com_android_bluetooth_sdp.cpp",

    ],

    header_libs: ["libbluetooth_headers"],

    include_dirs: [

        "system/bt/types",

    ],

    shared_libs: [

        "libbase",

        "libchrome",

        "libnativehelper",

        "liblog",

    ],

    static_libs: [

        "libbluetooth-types",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

        "-Wno-unused-parameter",

    ],

    sanitize: {

        scs: true,

    },

}