From 7c282854f3148515deee26a70ff289f20a4fb62f Mon Sep 17 00:00:00 2001
From: Lance Chang <jinwoong@google.com>
Date: Mon, 10 Jun 2024 22:27:42 -0700
Subject: [PATCH 1/3] Change TARGET_BUILD_APPS_WITH_BUILD_NUMBER to a product
 variable

This change allows unbundled app builds to embed the build number in the
version name by defining PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER, so that
APK files from a build can be easily identified.

Ignore-AOSP-First: changes in topics with internal-only projects
Test: manual build
Bug: 340311907
Change-Id: If7feda5eec2bc1e54a90b4adae1bd6da19e3ea45
---
 core/config.mk  | 4 ++--
 core/product.mk | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/config.mk b/core/config.mk
index 949ea54e91..4bb9a42943 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1193,8 +1193,8 @@ RSCOMPAT_NO_USAGEIO_API_LEVELS := 8 9 10 11 12 13
 
 APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)
 
-# Add BUILD_NUMBER to apps if TARGET_BUILD_APPS_WITH_BUILD_NUMBER is defined.
-ifeq ($(TARGET_BUILD_APPS_WITH_BUILD_NUMBER),true)
+# Add BUILD_NUMBER to apps if PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER is defined.
+ifeq ($(PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER),true)
   APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)-$(BUILD_NUMBER_FROM_FILE)
 endif
 
diff --git a/core/product.mk b/core/product.mk
index 7908e1dcfe..d469c0e737 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -493,6 +493,9 @@ _product_single_value_vars += PRODUCT_16K_DEVELOPER_OPTION
 # by this flag.
 _product_single_value_vars += PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG
 
+# If set, the default value of the versionName of apps will include the build number.
+_product_single_value_vars += PRODUCT_BUILD_APPS_WITH_BUILD_NUMBER
+
 .KATI_READONLY := _product_single_value_vars _product_list_vars
 _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)
 

From cc21bf8b2904ee1c114dee1c473254aad1b54113 Mon Sep 17 00:00:00 2001
From: Kyle Zhang <kelzhan@google.com>
Date: Tue, 11 Jun 2024 21:30:38 +0000
Subject: [PATCH 2/3] Set widevine apex signed with dev key

Bug: 341134913
Change-Id: Ied39e2a1dd4b715afc2ee4d35c18b52eabfc417f
---
 target/product/aosp_arm64.mk  | 3 +++
 target/product/aosp_x86_64.mk | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk
index 7a9325dae3..783ed3bcc0 100644
--- a/target/product/aosp_arm64.mk
+++ b/target/product/aosp_arm64.mk
@@ -58,6 +58,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
 AB_OTA_UPDATER := true
 AB_OTA_PARTITIONS ?= system
 
+# Set widevine apex signed with dev key
+$(call soong_config_set,widevine,use_devkey,true)
+
 #
 # Special settings for GSI releasing
 #
diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk
index 595940d9d1..e9ca482371 100644
--- a/target/product/aosp_x86_64.mk
+++ b/target/product/aosp_x86_64.mk
@@ -60,6 +60,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
 AB_OTA_UPDATER := true
 AB_OTA_PARTITIONS ?= system
 
+# Set widevine apex signed with dev key
+$(call soong_config_set,widevine,use_devkey,true)
+
 #
 # Special settings for GSI releasing
 #

From 2880eac1a383d3bd787d0a0d6e7b1c6681b9b9e7 Mon Sep 17 00:00:00 2001
From: Yihan Dong <slotus@google.com>
Date: Tue, 11 Jun 2024 08:07:30 +0000
Subject: [PATCH 3/3] Add Android Media Better Together team

Bug: 342941281
Change-Id: Ib96e26fe625511bd9e9cc3086f3ff12a234dc588
Test: m noting
---
 teams/Android.bp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/teams/Android.bp b/teams/Android.bp
index b3a5752749..084dad1bf3 100644
--- a/teams/Android.bp
+++ b/teams/Android.bp
@@ -4391,3 +4391,10 @@ team {
     // go/trendy/manage/engineers/5955405559201792
     trendy_team_id: "5955405559201792",
 }
+
+team {
+    name: "trendy_team_android_media_better_together",
+
+    // go/trendy/manage/engineers/5617300451721216
+    trendy_team_id: "5617300451721216",
+}
\ No newline at end of file