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

Commit 570aae73 authored by Jim Tang's avatar Jim Tang
Browse files

Create soong variables for gtvs 

Bug: 391046731
Test: lunch gtvs_ext_arm64-next-userdebug && m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ef1089217ae25351262078d708e04d8fecf048e8)
Merged-In: I71519d6bc708edb9107660365c41dd52a8f30f39
Change-Id: I71519d6bc708edb9107660365c41dd52a8f30f39

NOTE FOR REVIEWERS - original patch and result patch are not identical.
PLEASE REVIEW CAREFULLY.
Diffs between the patches:
 # Flags used in GTVS prebuilt apps
> +$(call soong_config_set_bool,GTVS,GTVS_COMPRESSED_PREBUILTS,$(if $(findstring $(GTVS_COMPRESSED_PREBUILTS),true yes),true,false))
> +$(call soong_config_set_bool,GTVS,GTVS_GMSCORE_BETA,$(if $(findstring $(GTVS_GMSCORE_BETA),true yes),true,false))
> +$(call soong_config_set_bool,GTVS,GTVS_SETUPWRAITH_BETA,$(if $(findstring $(GTVS_SETUPWRAITH_BETA),true yes),true,false))
> +$(call soong_config_set_bool,GTVS,PRODUCT_USE_PREBUILT_GTVS,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS),true yes),true,false))
> +
> +# Flags used in GTVS_GTV prebuilt apps
> +$(call soong_config_set_bool,GTVS_GTV,PRODUCT_USE_PREBUILT_GTVS_GTV,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS_GTV),true yes),true,false))
> +

Original patch:
 From ef108921 Mon Sep 17 00:00:00 2001
From: Jim Tang <jimtang@google.com>
Date: Wed, 12 Mar 2025 11:17:28 +0800
Subject: [PATCH] Create soong variables for gtvs

Bug: 391046731
Test: lunch gtvs_ext_arm64-next-userdebug && m
Change-Id: I71519d6bc708edb9107660365c41dd52a8f30f39
---

Result patch:
 diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 00fcb10..fc556d2 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -347,6 +347,15 @@
   $(call soong_config_set_bool,ci_tests,uses_widevine_tests, true)
 endif
 
+# Flags used in GTVS prebuilt apps
+$(call soong_config_set_bool,GTVS,GTVS_COMPRESSED_PREBUILTS,$(if $(findstring $(GTVS_COMPRESSED_PREBUILTS),true yes),true,false))
+$(call soong_config_set_bool,GTVS,GTVS_GMSCORE_BETA,$(if $(findstring $(GTVS_GMSCORE_BETA),true yes),true,false))
+$(call soong_config_set_bool,GTVS,GTVS_SETUPWRAITH_BETA,$(if $(findstring $(GTVS_SETUPWRAITH_BETA),true yes),true,false))
+$(call soong_config_set_bool,GTVS,PRODUCT_USE_PREBUILT_GTVS,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS),true yes),true,false))
+
+# Flags used in GTVS_GTV prebuilt apps
+$(call soong_config_set_bool,GTVS_GTV,PRODUCT_USE_PREBUILT_GTVS_GTV,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS_GTV),true yes),true,false))
+
 # Check m
[[[Result patch trimmed due to size. Decoded string size: 1179. Decoded string SHA1: 296cd02048e558954c34f1bf71662bcd9fd120ee.]]]

Change-Id: I8768d4dc593bb043bd0110b6880cf3625a5aa253
parent 38e83e37

core/android_soong_config_vars.mk

+9 −0
Original line number Diff line number Diff line
@@ -354,3 +354,12 @@ endif 
ifneq ($(wildcard bootable/deprecated-ota/applypatch),)

  $(call soong_config_set_bool,otatools,use_bootable_deprecated_ota_applypatch,true)

endif



# Flags used in GTVS prebuilt apps

$(call soong_config_set_bool,GTVS,GTVS_COMPRESSED_PREBUILTS,$(if $(findstring $(GTVS_COMPRESSED_PREBUILTS),true yes),true,false))

$(call soong_config_set_bool,GTVS,GTVS_GMSCORE_BETA,$(if $(findstring $(GTVS_GMSCORE_BETA),true yes),true,false))

$(call soong_config_set_bool,GTVS,GTVS_SETUPWRAITH_BETA,$(if $(findstring $(GTVS_SETUPWRAITH_BETA),true yes),true,false))

$(call soong_config_set_bool,GTVS,PRODUCT_USE_PREBUILT_GTVS,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS),true yes),true,false))



# Flags used in GTVS_GTV prebuilt apps

$(call soong_config_set_bool,GTVS_GTV,PRODUCT_USE_PREBUILT_GTVS_GTV,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS_GTV),true yes),true,false))