commit c4500afd1ba2515cd78d46e115d732915cf95bf2
author Jihoon Kang <jihoonkang@google.com> Thu Feb 08 01:46:28 2024 +0000
committer Jihoon Kang <jihoonkang@google.com> Thu Feb 08 01:46:28 2024 +0000
tree 4b6ab460aa08ef3c162aacf5d2a2113edd72ff4c
parent 0dc4e61753b4f08f3e3db0abc6399d4d9cc86d62

Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA

UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA enables user to specify
${codename}.${sha} as min_sdk_version and target_sdk_version in order to
support mainline train building into android build.

Test: TH
Bug: 295905124
Change-Id: I6c793bc83e88ec620ed5e2e87d0371bc2455cf1b

core/android_manifest.mk

diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index ff49262..7f46903 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -51,6 +51,9 @@
         my_target_sdk_version := $(my_target_sdk_version).$$(cat $(API_FINGERPRINT))
         my_min_sdk_version := $(my_min_sdk_version).$$(cat $(API_FINGERPRINT))
         $(fixed_android_manifest): $(API_FINGERPRINT)
+      else ifdef UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA
+        my_target_sdk_version := $(UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA)
+        my_min_sdk_version := $(UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA)
       endif
     endif
   endif