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

Commit 01eabbe6 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS"... 

Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" am: 37b11b8c am: 8875d060 am: bec8ecf5

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

Change-Id: I3ec4e39748865547d50175f623f25ac44cb3c8cc
parents 3a951869 bec8ecf5

core/config.mk

+4 −3
Original line number Diff line number Diff line
@@ -1083,12 +1083,13 @@ endef 
# This produces a list like "current/core current/public current/system 4/public"

TARGET_AVAILABLE_SDK_VERSIONS := $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/*/android.jar)

TARGET_AVAILABLE_SDK_VERSIONS := $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/android.jar,%,$(TARGET_AVAILABLE_SDK_VERSIONS))

# Strips and reorganizes the "public", "core" and "system" subdirs.

# Strips and reorganizes the "public", "core", "system" and "test" subdirs.

TARGET_AVAILABLE_SDK_VERSIONS := $(subst /public,,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_AVAILABLE_SDK_VERSIONS := $(patsubst %/core,core_%,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_AVAILABLE_SDK_VERSIONS := $(patsubst %/system,system_%,$(TARGET_AVAILABLE_SDK_VERSIONS))

# No prebuilt for test_current.

TARGET_AVAILABLE_SDK_VERSIONS += test_current

TARGET_AVAILABLE_SDK_VERSIONS := $(patsubst %/test,test_%,$(TARGET_AVAILABLE_SDK_VERSIONS))

# module-lib and system-server are not supported in Make.

TARGET_AVAILABLE_SDK_VERSIONS := $(filter-out %/module-lib %/system-server,$(TARGET_AVAILABLE_SDK_VERSIONS))

TARGET_AVAIALBLE_SDK_VERSIONS := $(call numerically_sort,$(TARGET_AVAILABLE_SDK_VERSIONS))



TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT := $(call numbers_less_than,24,$(TARGET_AVAILABLE_SDK_VERSIONS))