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

Commit 90f3ddee 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: I270cfc33908038be119865a9cd1d166929cb3842
parents 4dc5f549 a38e2a53
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@
// ========================================================
cc_library_static {
    name: "libbt-rootcanal",
    defaults: ["libchrome_support_defaults"],
    defaults: ["gd_defaults",],
    header_libs: ["jni_headers"],
    host_supported: true,
    proprietary: true,
    srcs: [
@@ -60,6 +61,7 @@ cc_library_static {
    ],
    shared_libs: [
        "libbase",
        "libchrome",
        "liblog",
    ],
    static_libs: [
+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;