Merge "Remove fluoride_defaults" (dca34c25) · Commits · e / os / android_packages_modules_Bluetooth

system/BUILD.gn

+0 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,6 @@ config("target_defaults") {
		cflags_cc = [ "-std=c++17" ]

		defines = [
		"HAS_NO_BDROID_BUILDCFG",
		"OS_GENERIC",
		"OS_LINUX_GENERIC",
		"TARGET_FLOSS",

system/audio_hal_interface/fuzzer/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ cc_defaults {
		"packages/modules/Bluetooth/system/bta/include",
		],
		cflags: [
		"-DHAS_NO_BDROID_BUILDCFG",
		// http://b/264549607
		"-Wno-deprecated-builtins",
		],

system/build/Android.bp

+11 −27

Original line number	Diff line number	Diff line
		@@ -7,22 +7,6 @@ package {
		default_applicable_licenses: ["system_bt_license"],
		}

		bootstrap_go_package {
		name: "soong-fluoride",
		pkgPath: "android/soong/fluoride",
		deps: [
		"blueprint",
		"blueprint-pathtools",
		"soong",
		"soong-android",
		"soong-cc",
		],
		srcs: [
		"fluoride.go",
		],
		pluginFor: ["soong_build"],
		}

		cc_defaults {
		name: "fluoride_common_options",
		cflags: [
		@@ -46,7 +30,7 @@ cc_defaults {
		},
		}

		fluoride_defaults {
		cc_defaults {
		name: "libchrome_support_defaults",
		defaults: ["fluoride_common_options"],
		static_libs: [
		@@ -71,7 +55,7 @@ fluoride_defaults {
		}

		// default to be used only on platform libs that can rely on shared libchrome
		fluoride_defaults {
		cc_defaults {
		name: "libchrome_shared_support_defaults",
		defaults: ["fluoride_common_options"],
		shared_libs: ["libchrome"],
		@@ -85,7 +69,7 @@ fluoride_defaults {

		// Fuzzable defaults are the subset of defaults that are used in fuzzing, which
		// requires no shared libraries, and no explicit sanitization.
		fluoride_defaults {
		cc_defaults {
		name: "fluoride_types_defaults_fuzzable",
		defaults: ["fluoride_common_options"],
		cflags: [
		@@ -107,7 +91,7 @@ fluoride_defaults {
		},
		}

		fluoride_defaults {
		cc_defaults {
		name: "fluoride_types_defaults",
		defaults: [
		"fluoride_types_defaults_fuzzable",
		@@ -115,7 +99,7 @@ fluoride_defaults {
		],
		}

		fluoride_defaults {
		cc_defaults {
		name: "fluoride_defaults_fuzzable",
		target: {
		android: {
		@@ -153,12 +137,12 @@ fluoride_defaults {
		min_sdk_version: "current",
		}

		fluoride_defaults {
		cc_defaults {
		name: "fluoride_test_prod_shared_defaults",
		defaults: ["fluoride_defaults"],
		}

		fluoride_defaults {
		cc_defaults {
		name: "fluoride_test_defaults",
		defaults: ["fluoride_test_prod_shared_defaults"],
		host_supported: true,
		@@ -182,7 +166,7 @@ fluoride_defaults {
		},
		}

		fluoride_defaults {
		cc_defaults {
		name: "fluoride_unit_test_defaults",
		defaults: ["fluoride_test_defaults"],
		test_options: {
		@@ -190,7 +174,7 @@ fluoride_defaults {
		},
		}

		fluoride_defaults {
		cc_defaults {
		name: "fluoride_basic_defaults",
		defaults: ["fluoride_test_prod_shared_defaults", "libchrome_support_defaults"],
		apex_available: [
		@@ -267,7 +251,7 @@ fluoride_defaults {
		},
		}

		fluoride_defaults {
		cc_defaults {
		name: "fluoride_full_defaults",
		defaults: ["fluoride_basic_defaults"],
		static_libs: [
		@@ -293,7 +277,7 @@ fluoride_defaults {
		],
		}

		fluoride_defaults {
		cc_defaults {
		name: "fluoride_defaults",
		defaults: ["fluoride_defaults_fuzzable", "fluoride_types_defaults"],
		static_libs: [

system/build/BUILD.gn

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ config("linux") {
		defines = [
		"_FORTIFY_SOURCE=2",
		"_GNU_SOURCE",
		"HAS_NO_BDROID_BUILDCFG",
		"LOG_NDEBUG=1",
		"EXPORT_SYMBOL=__attribute__((visibility(\"default\")))",
		"KERNEL_MISSING_CLOCK_BOOTTIME_ALARM=TRUE",

system/build/fluoride.go

deleted100644 → 0

+0 −63

Original line number	Diff line number	Diff line
		// Copyright 2016 The Android Open Source Project
		//
		// 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.
		package fluoride

		import (
		"strings"

		"android/soong/android"
		"android/soong/cc"
		)

		func init() {
		android.RegisterModuleType("fluoride_defaults", fluorideDefaultsFactory)
		}

		func fluorideDefaultsFactory() android.Module {
		module := cc.DefaultsFactory()
		android.AddLoadHook(module, fluorideDefaults)

		return module
		}

		func fluorideDefaults(ctx android.LoadHookContext) {
		type props struct {
		Include_dirs []string
		Cflags []string
		}

		p := &props{}
		p.Cflags, p.Include_dirs = globalDefaults(ctx)

		ctx.AppendProperties(p)
		}

		func globalDefaults(ctx android.LoadHookContext) ([]string, []string) {
		var cflags []string
		var includeDirs []string

		board_bt_buildcfg_include_dir := ctx.DeviceConfig().BtConfigIncludeDir()
		if len(board_bt_buildcfg_include_dir) > 0 {
		cflags = append(cflags, "-DHAS_BDROID_BUILDCFG")
		board_bt_buildcfg_include_dir_list :=
		strings.Fields(board_bt_buildcfg_include_dir)
		for _, buildcfg_dir := range board_bt_buildcfg_include_dir_list {
		includeDirs = append(includeDirs, buildcfg_dir)
		}
		} else {
		cflags = append(cflags, "-DHAS_NO_BDROID_BUILDCFG")
		}

		return cflags, includeDirs
		}