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

Commit fe23bcc4 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

RootCanal: Use GD defaults to define OS_ANDROID am: a38e2a53 

Change-Id: Id6852713ecc986a1d56af60c9c85dcc93f94c3a8
parents 36d5c62a a38e2a53

system/vendor_libs/test_vendor_lib/Android.bp

+3 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,8 @@ 
// ========================================================

// ========================================================

cc_library_static {

cc_library_static {

    name: "libbt-rootcanal",

    name: "libbt-rootcanal",

    defaults: ["libchrome_support_defaults"],

    defaults: ["gd_defaults",],

    header_libs: ["jni_headers"],

    host_supported: true,

    host_supported: true,

    proprietary: true,

    proprietary: true,

    srcs: [

    srcs: [
@@ -60,6 +61,7 @@ cc_library_static { 
    ],

    ],

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",

        "libchrome",

        "liblog",

        "liblog",

    ],

    ],

    static_libs: [

    static_libs: [

system/vendor_libs/test_vendor_lib/model/devices/scripted_beacon.cc

+1 −3
Original line number Original line Diff line number Diff line
@@ -14,9 +14,6 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#define OS_ANDROID

#include "os/log.h"

#undef OS_ANDROID

#include "scripted_beacon.h"

#include "scripted_beacon.h"





#include <fstream>

#include <fstream>
@@ -29,6 +26,7 @@ 




#include "model/devices/scripted_beacon_ble_payload.pb.h"

#include "model/devices/scripted_beacon_ble_payload.pb.h"

#include "model/setup/device_boutique.h"

#include "model/setup/device_boutique.h"

#include "os/log.h"





using std::vector;

using std::vector;