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

Commit 06548c27 authored by Arman Uguray's avatar Arman Uguray
Browse files

gn-build: Clean up GN files 

Removed unnecessary library and include flags from build files. To make the
initial build outputs more similar to Android, this CL changes the usage of the
GN "source_set" idiom to "static_library". This comes at a performance loss
while keeping the builds similar until we get the whole stack to compile.

BUG=21339022

Change-Id: I46f70b3b64b2537634a1dbb517a5168566230efb
parent bb23faf7

gki/BUILD.gn

+2 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#  limitations under the License.

#



source_set("gki") {

static_library("gki") {

  sources = [

    "common/gki_buffer.c",

    "ulinux/gki_ulinux.c",
@@ -23,11 +23,8 @@ source_set("gki") { 
  include_dirs = [

    "common",

    "ulinux",

    "//btcore/include",

    "//",

    "//include",

    "//osi/include",

    "//stack/include",

    "//utils/include",

    "//",

  ]

}

system/bta/BUILD.gn

+54 −50
Original line number Diff line number Diff line
@@ -14,86 +14,90 @@ 
#  limitations under the License.

#



source_set("bta") {

static_library("bta") {

  sources = [

    "dm/bta_dm_ci.c",

    "ag/bta_ag_act.c",

    "ag/bta_ag_api.c",

    "ag/bta_ag_at.c",

    "ag/bta_ag_cfg.c",

    "ag/bta_ag_ci.c",

    "ag/bta_ag_cmd.c",

    "ag/bta_ag_main.c",

    "ag/bta_ag_rfc.c",

    "ag/bta_ag_sco.c",

    "ag/bta_ag_sdp.c",

    "ar/bta_ar.c",

    "av/bta_av_aact.c",

    "av/bta_av_act.c",

    "av/bta_av_api.c",

    "av/bta_av_cfg.c",

    "av/bta_av_ci.c",

    "av/bta_av_main.c",

    "av/bta_av_sbc.c",

    "av/bta_av_ssm.c",

    "dm/bta_dm_act.c",

    "dm/bta_dm_pm.c",

    "dm/bta_dm_main.c",

    "dm/bta_dm_cfg.c",

    "dm/bta_dm_api.c",

    "dm/bta_dm_cfg.c",

    "dm/bta_dm_ci.c",

    "dm/bta_dm_main.c",

    "dm/bta_dm_pm.c",

    "dm/bta_dm_sco.c",

    "gatt/bta_gattc_act.c",

    "gatt/bta_gattc_api.c",

    "gatt/bta_gatts_act.c",

    "gatt/bta_gatts_main.c",

    "gatt/bta_gattc_utils.c",

    "gatt/bta_gattc_cache.c",

    "gatt/bta_gattc_ci.c",

    "gatt/bta_gatts_api.c",

    "gatt/bta_gattc_main.c",

    "gatt/bta_gattc_act.c",

    "gatt/bta_gattc_cache.c",

    "gatt/bta_gattc_utils.c",

    "gatt/bta_gatts_act.c",

    "gatt/bta_gatts_api.c",

    "gatt/bta_gatts_main.c",

    "gatt/bta_gatts_utils.c",

    "ag/bta_ag_sdp.c",

    "ag/bta_ag_sco.c",

    "ag/bta_ag_cfg.c",

    "ag/bta_ag_main.c",

    "ag/bta_ag_api.c",

    "ag/bta_ag_rfc.c",

    "ag/bta_ag_act.c",

    "ag/bta_ag_cmd.c",

    "ag/bta_ag_ci.c",

    "ag/bta_ag_at.c",

    "hf_client/bta_hf_client_act.c",

    "hf_client/bta_hf_client_api.c",

    "hf_client/bta_hf_client_at.c",

    "hf_client/bta_hf_client_cmd.c",

    "hf_client/bta_hf_client_main.c",

    "hf_client/bta_hf_client_rfc.c",

    "hf_client/bta_hf_client_at.c",

    "hf_client/bta_hf_client_sdp.c",

    "hf_client/bta_hf_client_sco.c",

    "hf_client/bta_hf_client_cmd.c",

    "hh/bta_hh_cfg.c",

    "hh/bta_hh_act.c",

    "hh/bta_hh_api.c",

    "hh/bta_hh_cfg.c",

    "hh/bta_hh_le.c",

    "hh/bta_hh_utils.c",

    "hh/bta_hh_main.c",

    "pan/bta_pan_main.c",

    "pan/bta_pan_ci.c",

    "pan/bta_pan_act.c",

    "pan/bta_pan_api.c",

    "av/bta_av_act.c",

    "av/bta_av_ci.c",

    "av/bta_av_api.c",

    "av/bta_av_aact.c",

    "av/bta_av_main.c",

    "av/bta_av_cfg.c",

    "av/bta_av_ssm.c",

    "av/bta_av_sbc.c",

    "ar/bta_ar.c",

    "hh/bta_hh_utils.c",

    "hl/bta_hl_act.c",

    "hl/bta_hl_api.c",

    "hl/bta_hl_ci.c",

    "hl/bta_hl_main.c",

    "hl/bta_hl_utils.c",

    "hl/bta_hl_sdp.c",

    "hl/bta_hl_ci.c",

    "mce/bta_mce_api.c",

    "mce/bta_mce_main.c",

    "hl/bta_hl_utils.c",

    "jv/bta_jv_act.c",

    "jv/bta_jv_api.c",

    "jv/bta_jv_cfg.c",

    "jv/bta_jv_main.c",

    "mce/bta_mce_act.c",

    "mce/bta_mce_api.c",

    "mce/bta_mce_cfg.c",

    "sys/bta_sys_main.c",

    "mce/bta_mce_main.c",

    "pan/bta_pan_act.c",

    "pan/bta_pan_api.c",

    "pan/bta_pan_ci.c",

    "pan/bta_pan_main.c",

    "sdp/bta_sdp.c",

    "sdp/bta_sdp_act.c",

    "sdp/bta_sdp_api.c",

    "sdp/bta_sdp_cfg.c",

    "sys/bta_sys_conn.c",

    "sys/bta_sys_main.c",

    "sys/utl.c",

    "jv/bta_jv_act.c",

    "jv/bta_jv_cfg.c",

    "jv/bta_jv_main.c",

    "jv/bta_jv_api.c",

  ]



  include_dirs = [

    "include",

    "sys",

    "dm",

    "hh",

    "include",

    "sys",

    "//",

    "//btcore/include",

    "//gki/common",
@@ -104,8 +108,8 @@ source_set("bta") { 
    "//stack/btm",

    "//osi/include",

    "//udrv/include",

    "//vnd/include",

    "//utils/include",

    "//vnd/include",

  ]



  cflags = [

system/btcore/BUILD.gn

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#  limitations under the License.

#



source_set("btcore") {

static_library("btcore") {

  sources = [

    "src/bdaddr.c",

    "src/counter.c",
@@ -50,7 +50,7 @@ executable("net_test_btcore") { 
  deps = [

    "//btcore",

    "//osi",

    "//testing/gtest:gtest_main",

    "//third_party/gtest:gtest_main",

  ]



  libs = [ "-lpthread", "-lrt", "-ldl" ]

system/build/config/BUILDCONFIG.gn

+8 −0
Original line number Diff line number Diff line
@@ -39,3 +39,11 @@ set_defaults("source_set") { 
    "//build:default_include_dirs",

  ]

}



set_defaults("static_library") {

  configs = [

    "//build:linux",

    "//build:gc",

    "//build:default_include_dirs",

  ]

}

system/build/toolchain/gcc/BUILD.gn

+2 −4
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ toolchain("gcc") { 
    ]

    default_output_extension = ".a"



    # TODO(armansito): is the following needed?

    #output_prefix = "lib"

    output_prefix = "lib"

  }



  tool("solink") {
@@ -71,8 +70,7 @@ toolchain("gcc") { 
    link_output = soname

    depend_output = soname



    # TODO(armansito): is the following needed?

    #output_prefix = "lib"

    output_prefix = "lib"

  }



  tool("link") {