Commit 79bf9640 authored Mar 07, 2020 by Jiyong Park

system_server_current is accepted

Previously, has-system-sdk-version incorrectly returned true for
the sdk version 'system_server_current', just because it started with
system_. Since system_server_current is a totally different API surface
than system_*, make the macro to return false for system_server_*.

Bug: 146757305
Test: m
Test: add 'sdk_version: "system_server_current" to wifi-service-pre-jarjar
Change-Id: I43700545b0f120fa987696b8f03a4765d97e13e2

parent fbebe69e

core/definitions.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -3242,11 +3242,12 @@ endef

		###########################################################
		## Find system_$(VER) in LOCAL_SDK_VERSION
		## note: system_server_* is excluded. It's a different API surface
		##
		## $(1): LOCAL_SDK_VERSION
		###########################################################
		define has-system-sdk-version
		$(filter system_%,$(1))
		$(filter-out system_server_%,$(filter system_%,$(1)))
		endef

		###########################################################