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

Commit 1fb84a7a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ib6b9b991,I620221cb 

* changes:
  floss: Change build rules from //bt to //bt/system
  Revert "Floss: Fix build post repo migration"
parents bff45ba1 947d4685

BUILD.gn

0 → 100644
+29 −0
Original line number Diff line number Diff line 
#

#  Copyright 2020 Google, Inc.

#

#  Licensed under the Apache License, Version 2.0 (the "License");

#  you may not use this file except in compliance with the License.

#  You may obtain a copy of the License at:

#

#  http://www.apache.org/licenses/LICENSE-2.0

#

#  Unless required by applicable law or agreed to in writing, software

#  distributed under the License is distributed on an "AS IS" BASIS,

#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

#  See the License for the specific language governing permissions and

#  limitations under the License.

#



# This is the root build file for GN. GN will start processing by loading this

# file, and recursively load all dependencies until all dependencies are either

# resolved or known not to exist (which will cause the build to fail). So if

# you add a new build file, there must be some path of dependencies from this

# file to your new one or GN won't know about it.



group("all") {

  deps = [ "//bt/system:all" ]

}



group("tools") {

  deps = [ "//bt/system:tools" ]

}

system/Cargo.toml→Cargo.toml

+5 −5
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
[workspace]



members = [

  "gd/rust/shim",

  "gd/rust/topshim",

  "gd/rust/linux/mgmt",

  "gd/rust/linux/service",

  "gd/rust/linux/client",

  "system/gd/rust/shim",

  "system/gd/rust/topshim",

  "system/gd/rust/linux/mgmt",

  "system/gd/rust/linux/service",

  "system/gd/rust/linux/client",

]

system/build.py→build.py

+0 −0

File moved.

View file

system/BUILD.gn

+23 −23
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ group("all") { 
# This pulls in main/BUILD.gn and all of its dependencies.

group("bluetooth") {

  deps = [

    "//bt/main:bluetooth",

    "//bt/main:bluetooth-static",

    #"//bt/service:bluetoothtbd",

    "//bt/system/main:bluetooth",

    "//bt/system/main:bluetooth-static",

    #"//bt/system/service:bluetoothtbd",

  ]

}
@@ -41,14 +41,14 @@ group("bluetooth") { 
#if (use.test) {

  #group("bluetooth_tests") {

    #deps = [

      #"//bt/btcore:net_test_btcore",

      #"//bt/common:bluetooth_test_common",

      #"//bt/profile/avrcp:net_test_avrcp",

      #"//bt/service:bluetoothtbd_test",

      #"//bt/stack:net_test_btm_iso",

      #"//bt/types:net_test_types",



      ##"//bt/packet:net_test_btpackets",

      #"//bt/system/btcore:net_test_btcore",

      #"//bt/system/common:bluetooth_test_common",

      #"//bt/system/profile/avrcp:net_test_avrcp",

      #"//bt/system/service:bluetoothtbd_test",

      #"//bt/system/stack:net_test_btm_iso",

      #"//bt/system/types:net_test_types",



      ##"//bt/system/packet:net_test_btpackets",

    #]

  #}

#}
@@ -56,8 +56,8 @@ group("bluetooth") { 
if (host_cpu == target_cpu && host_os == target_os) {

  group("tools") {

    deps = [

      "//bt/gd/dumpsys/bundler:bluetooth_flatbuffer_bundler",

      "//bt/gd/packet/parser:bluetooth_packetgen",

      "//bt/system/gd/dumpsys/bundler:bluetooth_flatbuffer_bundler",

      "//bt/system/gd/packet/parser:bluetooth_packetgen",

    ]

  }

}
@@ -65,24 +65,24 @@ if (host_cpu == target_cpu && host_os == target_os) { 
if (defined(use.android) && use.android) {

  group("android_bluetooth_tests") {

    deps = [

      "//bt/device:net_test_device",

      "//bt/hci:net_test_hci",

      "//bt/osi:net_test_osi",

      "//bt/test/suite:net_test_bluetooth",

      "//bt/system/device:net_test_device",

      "//bt/system/hci:net_test_hci",

      "//bt/system/osi:net_test_osi",

      "//bt/system/test/suite:net_test_bluetooth",

    ]

  }

}



config("target_defaults") {

  include_dirs = [

    "//bt",

    "//bt/linux_include",

    "//bt/types",

    "//bt/include",

    "//bt/system",

    "//bt/system/linux_include",

    "//bt/system/types",

    "//bt/system/include",



    # For flatbuffer generated headers

    "${root_gen_dir}/bt/gd/",

    "${root_gen_dir}/bt/gd/dumpsys/bundler",

    "${root_gen_dir}/bt/system/gd/",

    "${root_gen_dir}/bt/system/gd/dumpsys/bundler",

  ]



  cflags = [

system/audio_hal_interface/BUILD.gn

+8 −8
Original line number Diff line number Diff line
@@ -21,17 +21,17 @@ static_library("audio_hal_interface") { 
  ]



  include_dirs = [

    "//bt/bta/include",

    "//bt/btif/include",

    "//bt/internal_include",

    "//bt/stack/include",

    "//bt/gd/rust/shim",

    "//bt/system/bta/include",

    "//bt/system/btif/include",

    "//bt/system/internal_include",

    "//bt/system/stack/include",

    "//bt/system/gd/rust/shim",

  ]



  configs += [ "//bt:target_defaults" ]

  configs += [ "//bt/system:target_defaults" ]



  deps = [

    "//bt/common",

    "//bt/osi:osi",

    "//bt/system/common",

    "//bt/system/osi:osi",

  ]

}