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

Commit 0c49bcf1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add LOCAL_SDK_VERSION := system_$(VER)"

parents b4e72d71 ef212cbe

core/apidiff.mk

+7 −2
Original line number Diff line number Diff line
@@ -56,10 +56,15 @@ ifneq ($(LOCAL_SDK_VERSION),) 
  else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),test_current)

    LOCAL_JAVA_LIBRARIES := android_test_stubs_current $(LOCAL_JAVA_LIBRARIES)

    $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, android_test_stubs_current)

  else

    ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))

      LOCAL_JAVA_LIBRARIES := system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)) $(LOCAL_JAVA_LIBRARIES)

      $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)))

    else

      LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)

      $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))

    endif

  endif

else

  LOCAL_JAVA_LIBRARIES := core-oj core-libart ext framework $(LOCAL_JAVA_LIBRARIES)

  $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-oj):$(call java-lib-files, core-libart)

core/base_rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ $(call pretty-error,Only one of LOCAL_PROPRIETARY_MODULE[$(LOCAL_PROPRIETARY_MOD 
endif



include $(BUILD_SYSTEM)/local_vndk.mk

include $(BUILD_SYSTEM)/local_vsdk.mk



my_module_tags := $(LOCAL_MODULE_TAGS)

ifeq ($(my_host_cross),true)

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ else 
ifneq (,$(LOCAL_SDK_VERSION))

# Set target-api for LOCAL_SDK_VERSIONs other than current.

ifneq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION)))

renderscript_target_api := $(LOCAL_SDK_VERSION)

renderscript_target_api := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))

endif

endif  # LOCAL_SDK_VERSION is set

endif  # LOCAL_RENDERSCRIPT_TARGET_API is set

core/config.mk

+5 −0
Original line number Diff line number Diff line
@@ -897,6 +897,11 @@ TARGET_AVAILABLE_SDK_VERSIONS := $(call numerically_sort,\ 
    $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/android.jar,%, \

    $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/android.jar)))



TARGET_AVAILABLE_SDK_VERSIONS := $(addprefix system_,$(call numerically_sort,\

    $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/android_system.jar,%, \

    $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/android_system.jar)))) \

    $(TARGET_AVAILABLE_SDK_VERSIONS)



# We don't have prebuilt test_current SDK yet.

TARGET_AVAILABLE_SDK_VERSIONS := test_current $(TARGET_AVAILABLE_SDK_VERSIONS)

core/definitions.mk

+19 −0
Original line number Diff line number Diff line
@@ -3395,3 +3395,22 @@ $(foreach source,$(ENFORCE_RRO_SOURCES), \ 
  $(eval ALL_MODULES.$(enforce_rro_source_module).REQUIRED += $(enforce_rro_module)) \

)

endef



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

## Find system_$(VER) in LOCAL_SDK_VERSION

##

## $(1): LOCAL_SDK_VERSION

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

define has-system-sdk-version

$(filter system_%,$(1))

endef



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

## Get numerical version in LOCAL_SDK_VERSION

##

## $(1): LOCAL_SDK_VERSION

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

define get-numeric-sdk-version

$(filter-out current,\

  $(if $(call has-system-sdk-version,$(1)),$(patsubst system_%,%,$(1)),$(1)))

endef