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

Commit b3c4d6a4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7310088 from 6152885d to sc-release 

Change-Id: I2e8e90d595f590b17630a3e8ba1ea0ecea27bdb6
parents d28611f8 6152885d

BUILD.gn

+4 −2
Original line number Diff line number Diff line
@@ -104,7 +104,9 @@ config("target_defaults") { 
    "-Wno-final-dtor-non-final-class",

  ]



  cflags_cc = [ "-std=c++17" ]

  cflags_cc = [

    "-std=c++17",

  ]



  defines = [

    "HAS_NO_BDROID_BUILDCFG",
@@ -116,7 +118,7 @@ config("target_defaults") { 


  # If not configured as a dynamic library, default to static library

  if (!(defined(use.bt_dynlib) && use.bt_dynlib)) {

    defines = [

    defines += [

      "STATIC_LIBBLUETOOTH",

    ]

  }

README.md

+16 −4
Original line number Diff line number Diff line
@@ -49,12 +49,24 @@ The following third-party dependencies are necessary but currently unavailable 
via a package manager. You may have to build these from source and install them

to your local environment.



TODO(abhishekpandit) - Provide a pre-packaged option for these or proper build

instructions from source.



* libchrome

* modp_b64

* tinyxml2



We provide a script to produce debian packages for those components, please

follow the instructions in build/dpkg/README.txt.



The googletest packages provided by Debian/Ubuntu (libgmock-dev and

libgtest-dev) do not provide pkg-config files, so you can build your own

googletest using the steps below:



```

$ git clone https://github.com/google/googletest.git -b release-1.10.0

$ cd googletest        # Main directory of the cloned repository.

$ mkdir build          # Create a directory to hold the build output.

$ cd build

$ cmake ..             # Generate native build scripts for GoogleTest.

$ sudo make install -DCMAKE_INSTALL_PREFIX=/usr

```



### Stage your build environment

build.py

+44 −7
Original line number Diff line number Diff line
@@ -61,11 +61,21 @@ VALID_TARGETS = [ 
    'tools',  # Build the host tools (i.e. packetgen)

    'rust',  # Build only the rust components + copy artifacts to output dir

    'main',  # Build the main C++ codebase

    'test',  # Build and run the unit tests

    'test',  # Run the unit tests

    'clean',  # Clean up output directory

    'all',  # All targets except test and clean

]



HOST_TESTS = [

    'bluetooth_test_common',

    'bluetoothtbd_test',

    'net_test_avrcp',

    'net_test_btcore',

    'net_test_types',

    'net_test_btm_iso',

    'net_test_btpackets',

]





class UseFlags():
@@ -110,6 +120,7 @@ class HostBuild(): 
        self.jobs = self.args.jobs

        if not self.jobs:

            self.jobs = multiprocessing.cpu_count()

            print("Number of jobs = {}".format(self.jobs))



        # Normalize all directories

        self.output_dir = os.path.abspath(self.args.output)
@@ -123,7 +134,13 @@ class HostBuild(): 
        if hasattr(self.args, 'target') and self.args.target:

            self.target = self.args.target



        self.use = UseFlags(self.args.use if self.args.use else [])

        target_use = self.args.use if self.args.use else []



        # Unless set, always build test code

        if not self.args.notest:

            target_use.append('test')



        self.use = UseFlags(target_use)



        # Validate platform directory

        assert os.path.isdir(self.platform_dir), 'Platform dir does not exist'
@@ -137,6 +154,18 @@ class HostBuild(): 


        self.configure_environ()



    def _generate_rustflags(self):

        """ Rustflags to include for the build.

      """

        rust_flags = [

            '-L',

            '{}/out/Default/'.format(self.output_dir),

            '-C',

            'link-arg=-Wl,--allow-multiple-definition',

        ]



        return ' '.join(rust_flags)



    def configure_environ(self):

        """ Configure environment variables for GN and Cargo.

        """
@@ -150,6 +179,7 @@ class HostBuild(): 
        # Configure Rust env variables

        self.env['CARGO_TARGET_DIR'] = self.output_dir

        self.env['CARGO_HOME'] = os.path.join(self.output_dir, 'cargo_home')

        self.env['RUSTFLAGS'] = self._generate_rustflags()



        # Configure some GN variables

        if self.use_board:
@@ -364,7 +394,15 @@ class HostBuild(): 
    def _target_test(self):

        """ Runs the host tests.

        """

        raise Exception('Not yet implemented')

        # Rust tests first

        self.run_command('test', ['cargo', 'test'], cwd=os.path.join(self.platform_dir, 'bt'), env=self.env)



        # Host tests second based on host test list

        for t in HOST_TESTS:

            self.run_command(

                'test', [os.path.join(self.output_dir, 'out/Default', t)],

                cwd=os.path.join(self.output_dir),

                env=self.env)



    def _target_clean(self):

        """ Delete the output directory entirely.
@@ -393,8 +431,6 @@ class HostBuild(): 
        elif self.target == 'main':

            self._target_main()

        elif self.target == 'test':

            self.use.set_flag('test')

            self._target_all()

            self._target_test()

        elif self.target == 'clean':

            self._target_clean()
@@ -406,14 +442,15 @@ if __name__ == '__main__': 
    parser = argparse.ArgumentParser(description='Simple build for host.')

    parser.add_argument('--output', help='Output directory for the build.', required=True)

    parser.add_argument('--platform-dir', help='Directory where platform2 is staged.', required=True)

    parser.add_argument('--clang', help='Use clang compiler.', default=False, action="store_true")

    parser.add_argument('--clang', help='Use clang compiler.', default=False, action='store_true')

    parser.add_argument('--use', help='Set a specific use flag.')

    parser.add_argument('--notest', help="Don't compile test code.", default=False, action='store_true')

    parser.add_argument('--target', help='Run specific build target')

    parser.add_argument('--sysroot', help='Set a specific sysroot path', default='/')

    parser.add_argument('--libdir', help='Libdir - default = usr/lib64', default='usr/lib64')

    parser.add_argument('--use-board', help='Use a built x86 board for dependencies. Provide path.')

    parser.add_argument('--jobs', help='Number of jobs to run', default=0, type=int)

    parser.add_argument('--vendored-rust', help='Use vendored rust crates', default=False, action="store_true")

    parser.add_argument('--vendored-rust', help='Use vendored rust crates', default=False, action='store_true')

    parser.add_argument('--verbose', help='Verbose logs for build.')



    args = parser.parse_args()

system/binder/android/bluetooth/IBluetoothGatt.aidl

+52 −52
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ import android.bluetooth.le.IScannerCallback; 
 */

interface IBluetoothGatt {

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);

    List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    void registerScanner(in IScannerCallback callback, in WorkSource workSource);

    void registerScanner(in IScannerCallback callback, in WorkSource workSource, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    void unregisterScanner(in int scannerId);

    void unregisterScanner(in int scannerId, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    void startScan(in int scannerId, in ScanSettings settings, in List<ScanFilter> filters,

                   in List scanStorages, in AttributionSource attributionSource);
@@ -56,121 +56,121 @@ interface IBluetoothGatt { 
    void startScanForIntent(in PendingIntent intent, in ScanSettings settings, in List<ScanFilter> filters,

                            in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    void stopScanForIntent(in PendingIntent intent);

    void stopScanForIntent(in PendingIntent intent, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    void stopScan(in int scannerId);

    void stopScan(in int scannerId, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    void flushPendingBatchResults(in int scannerId);

    void flushPendingBatchResults(in int scannerId, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void startAdvertisingSet(in AdvertisingSetParameters parameters, in AdvertiseData advertiseData,

                                in AdvertiseData scanResponse, in PeriodicAdvertisingParameters periodicParameters,

                                in AdvertiseData periodicData, in int duration, in int maxExtAdvEvents,

                                in IAdvertisingSetCallback callback);

                                in IAdvertisingSetCallback callback, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void stopAdvertisingSet(in IAdvertisingSetCallback callback);

    void stopAdvertisingSet(in IAdvertisingSetCallback callback, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")

    void getOwnAddress(in int advertiserId);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void enableAdvertisingSet(in int advertiserId, in boolean enable, in int duration, in int maxExtAdvEvents);

    void enableAdvertisingSet(in int advertiserId, in boolean enable, in int duration, in int maxExtAdvEvents, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setAdvertisingData(in int advertiserId, in AdvertiseData data);

    void setAdvertisingData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setScanResponseData(in int advertiserId, in AdvertiseData data);

    void setScanResponseData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setAdvertisingParameters(in int advertiserId, in AdvertisingSetParameters parameters);

    void setAdvertisingParameters(in int advertiserId, in AdvertisingSetParameters parameters, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingParameters(in int advertiserId, in PeriodicAdvertisingParameters parameters);

    void setPeriodicAdvertisingParameters(in int advertiserId, in PeriodicAdvertisingParameters parameters, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingData(in int advertiserId, in AdvertiseData data);

    void setPeriodicAdvertisingData(in int advertiserId, in AdvertiseData data, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")

    void setPeriodicAdvertisingEnable(in int advertiserId, in boolean enable);

    void setPeriodicAdvertisingEnable(in int advertiserId, in boolean enable, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback);

    void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)")

    void unregisterSync(in IPeriodicAdvertisingCallback callback);

    void unregisterSync(in IPeriodicAdvertisingCallback callback, in AttributionSource attributionSource);



    @UnsupportedAppUsage

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback, boolean eatt_support);

    void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback, boolean eatt_support, in AttributionSource attributionSource);



    @UnsupportedAppUsage

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void unregisterClient(in int clientIf);

    void unregisterClient(in int clientIf, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void clientConnect(in int clientIf, in String address, in boolean isDirect, in int transport, in boolean opportunistic, in int phy);

    void clientConnect(in int clientIf, in String address, in boolean isDirect, in int transport, in boolean opportunistic, in int phy, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void clientDisconnect(in int clientIf, in String address);

    void clientDisconnect(in int clientIf, in String address, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void clientSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions);

    void clientSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void clientReadPhy(in int clientIf, in String address);

    void clientReadPhy(in int clientIf, in String addres, in AttributionSource attributionSources);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void refreshDevice(in int clientIf, in String address);

    void refreshDevice(in int clientIf, in String address, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void discoverServices(in int clientIf, in String address);

    void discoverServices(in int clientIf, in String address, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void discoverServiceByUuid(in int clientIf, in String address, in ParcelUuid uuid);

    void discoverServiceByUuid(in int clientIf, in String address, in ParcelUuid uuid, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void readCharacteristic(in int clientIf, in String address, in int handle, in int authReq);

    void readCharacteristic(in int clientIf, in String address, in int handle, in int authReq, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void readUsingCharacteristicUuid(in int clientIf, in String address, in ParcelUuid uuid,

                           in int startHandle, in int endHandle, in int authReq);

                           in int startHandle, in int endHandle, in int authReq, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void writeCharacteristic(in int clientIf, in String address, in int handle,

                            in int writeType, in int authReq, in byte[] value);

                            in int writeType, in int authReq, in byte[] value, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void readDescriptor(in int clientIf, in String address, in int handle, in int authReq);

    void readDescriptor(in int clientIf, in String address, in int handle, in int authReq, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void writeDescriptor(in int clientIf, in String address, in int handle,

                            in int authReq, in byte[] value);

                            in int authReq, in byte[] value, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void registerForNotification(in int clientIf, in String address, in int handle, in boolean enable);

    void registerForNotification(in int clientIf, in String address, in int handle, in boolean enable, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void beginReliableWrite(in int clientIf, in String address);

    void beginReliableWrite(in int clientIf, in String address, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void endReliableWrite(in int clientIf, in String address, in boolean execute);

    void endReliableWrite(in int clientIf, in String address, in boolean execute, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void readRemoteRssi(in int clientIf, in String address);

    void readRemoteRssi(in int clientIf, in String address, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void configureMTU(in int clientIf, in String address, in int mtu);

    void configureMTU(in int clientIf, in String address, in int mtu, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void connectionParameterUpdate(in int clientIf, in String address, in int connectionPriority);

    void connectionParameterUpdate(in int clientIf, in String address, in int connectionPriority, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void leConnectionUpdate(int clientIf, String address, int minInterval,

                            int maxInterval, int peripheralLatency, int supervisionTimeout,

                            int minConnectionEventLen, int maxConnectionEventLen);

                            int minConnectionEventLen, int maxConnectionEventLen, in AttributionSource attributionSource);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback, boolean eatt_support);

    void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback, boolean eatt_support, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void unregisterServer(in int serverIf);

    void unregisterServer(in int serverIf, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport);

    void serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void serverDisconnect(in int serverIf, in String address);

    void serverDisconnect(in int serverIf, in String address, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void serverSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions);

    void serverSetPreferredPhy(in int clientIf, in String address, in int txPhy, in int rxPhy, in int phyOptions, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void serverReadPhy(in int clientIf, in String address);

    void serverReadPhy(in int clientIf, in String address, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void addService(in int serverIf, in BluetoothGattService service);

    void addService(in int serverIf, in BluetoothGattService service, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void removeService(in int serverIf, in int handle);

    void removeService(in int serverIf, in int handle, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void clearServices(in int serverIf);

    void clearServices(in int serverIf, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void sendResponse(in int serverIf, in String address, in int requestId,

                            in int status, in int offset, in byte[] value);

                            in int status, in int offset, in byte[] value, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void sendNotification(in int serverIf, in String address, in int handle,

                            in boolean confirm, in byte[] value);

                            in boolean confirm, in byte[] value, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void disconnectAll();

    void disconnectAll(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void unregAll();

    void unregAll(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    int numHwTrackFiltersAvailable();

    int numHwTrackFiltersAvailable(in AttributionSource attributionSource);

}

system/bta/test/common/mock_main_shim_acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -61,6 +61,6 @@ void bluetooth::shim::ACL_Disconnect(uint16_t handle, bool is_classic, 
  mock_function_count_map[__func__]++;

}

void bluetooth::shim::ACL_Shutdown() { mock_function_count_map[__func__]++; }

void bluetooth::shim::ACL_WriteData(uint16_t handle, const BT_HDR* p_buf) {

void bluetooth::shim::ACL_WriteData(uint16_t handle, BT_HDR* p_buf) {

  mock_function_count_map[__func__]++;

}