Skip to content

Commit

Permalink
Set is_cobalt = false by default (#4445)
Browse files Browse the repository at this point in the history
b/377271824

Setting is_cobalt=false by default as discussed in go/cobaltgnpy
  • Loading branch information
niranjanyardi authored Nov 19, 2024
1 parent 7bb8252 commit 03ed8d2
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 15 deletions.
13 changes: 6 additions & 7 deletions .gn
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,10 @@ exec_script_whitelist =
"//tools/gritsettings/BUILD.gn",
]

# TODO(b/378960295): Try to remove the allowlisted files.
import("//cobalt/build/configs/cobalt.gni")
if (is_cobalt) {
exec_script_whitelist += [
"//starboard/tools/BUILD.gn",
"//starboard/build/config/sabi/BUILD.gn",
"//starboard/build/platform_path.gni",
]
}
exec_script_whitelist += [
"//starboard/tools/BUILD.gn",
"//starboard/build/config/sabi/BUILD.gn",
"//starboard/build/platform_path.gni",
]
1 change: 1 addition & 0 deletions cobalt/build/configs/android-arm/args.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import("//cobalt/build/configs/proprietary_codecs.gn")

target_os = "android"
target_cpu = "arm"
is_cobalt = true

# TODO(b/378934120): Remove flags below this line

Expand Down
1 change: 1 addition & 0 deletions cobalt/build/configs/android-arm64/args.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import("//cobalt/build/configs/proprietary_codecs.gn")

target_os = "android"
target_cpu = "arm64"
is_cobalt = true

# TODO(b/378934120): Remove flags below this line

Expand Down
1 change: 1 addition & 0 deletions cobalt/build/configs/android-x86/args.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import("//cobalt/build/configs/proprietary_codecs.gn")

target_os = "android"
target_cpu = "x86"
is_cobalt = true

# TODO(b/378934120): Remove flags below this line

Expand Down
1 change: 0 additions & 1 deletion cobalt/build/configs/chromium_android-arm/args.gn
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
target_os = "android"
target_cpu = "arm"
is_cobalt = false
1 change: 0 additions & 1 deletion cobalt/build/configs/chromium_android-arm64/args.gn
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
target_os = "android"
target_cpu = "arm64"
is_cobalt = false
1 change: 0 additions & 1 deletion cobalt/build/configs/chromium_android-x86/args.gn
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
target_os = "android"
target_cpu = "x86"
is_cobalt = false
1 change: 0 additions & 1 deletion cobalt/build/configs/chromium_linux-x64x11/args.gn
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
target_os = "linux"
target_cpu = "x64"
is_cobalt = false

# TODO(b/376141256): Decide if this flag is needed here or in .gclient file
chrome_pgo_phase = 0
6 changes: 2 additions & 4 deletions cobalt/build/configs/cobalt.gni
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Get the path to the starboard implementation and include its GN
# configuration.

# is_cobalt is just declared here and potentially overridden while running gn gen.
declare_args() {
is_cobalt = true
is_cobalt = false
}
1 change: 1 addition & 0 deletions cobalt/build/configs/linux-x64x11/args.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import("//cobalt/build/configs/proprietary_codecs.gn")

target_os = "linux"
target_cpu = "x64"
is_cobalt = true

use_ozone = true

Expand Down

0 comments on commit 03ed8d2

Please sign in to comment.