commit 7d2c5ff02d4f0b4c28a9fe72dea533fecbc9c182
author Jihoon Kang <jihoonkang@google.com> Tue Feb 13 04:27:21 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 13 04:27:21 2024 +0000
tree 819d25aa63fdbc3c63324c4586e41862eb0afff6
parent 5fd1645f1104c5d7cdbecd2825ae8738e698193e
parent c4500afd1ba2515cd78d46e115d732915cf95bf2

Merge "Add environment variable UNBUNDLED_BUILD_TARGET_SDK_WITH_DESSERT_SHA" into main

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