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

Commit 5b15ae05 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "sysprops_module: Allow link to host for unittesting" into main am: 98876e4f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3081245



Change-Id: Ib84336c325964f38ecd6c77a4b1c20229971ae54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33a4fca8 98876e4f

system/gd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ cc_defaults { 
            srcs: [

                ":BluetoothHalSources_hci_host",

                ":BluetoothOsSources_host",

                ":BluetoothSyspropsSources",

            ],

        },

        android: {

system/gd/sysprops/sysprops_module.h

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 */

#pragma once



#if !defined(TARGET_FLOSS)

#error "sysprops_module is supposed to be FLOSS specific"

#ifdef __ANDROID__

#error "sysprops_module is not supposed to be used on Android"

#endif



#include "module.h"