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

Commit c47a55fd authored by Sebastian Ene's avatar Sebastian Ene Committed by Automerger Merge Worker
Browse files

Merge "Drop the PLATFORM_VERSION_CODENAME conditional" am: 399c35d4 

Original change: https://android-review.googlesource.com/c/platform/build/+/2077518



Change-Id: I14788fa34f0c4673c991ef2cafe68005a83c1126
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82ecb99a 399c35d4

core/version_util.mk

+23 −25
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ MAX_PLATFORM_VERSION := 
# unreleased API level targetable by this branch, not just those that are valid

# lunch targets for this branch.



ifndef PLATFORM_VERSION_CODENAME

PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))

ifndef PLATFORM_VERSION_CODENAME

  # PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION
@@ -85,7 +84,6 @@ ifndef PLATFORM_VERSION_CODENAME 
PLATFORM_VERSION_ALL_CODENAMES := \

  $(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES)))



endif

.KATI_READONLY := \

  PLATFORM_VERSION_CODENAME \

  PLATFORM_VERSION_ALL_CODENAMES