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

Commit 7081e275 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Use GD defaults to define OS_ANDROID" am: 29d8ab1d 

Change-Id: I526f90f7e73c48b7637436da9bc0ef945d01a12a
parents bb0b48fa 29d8ab1d

system/vendor_libs/test_vendor_lib/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
cc_library_static {

    name: "libbt-rootcanal",

    defaults: [

        "libchrome_support_defaults",

        "gd_defaults",

        "gd_clang_tidy",

    ],

    host_supported: true,
@@ -63,6 +63,7 @@ cc_library_static { 
    ],

    shared_libs: [

        "libbase",

        "libchrome",

        "liblog",

    ],

    static_libs: [

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

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

 */



#define OS_ANDROID

#include "os/log.h"

#undef OS_ANDROID

#include "scripted_beacon.h"



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


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

#include "model/setup/device_boutique.h"

#include "os/log.h"



using std::vector;