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

Commit f55b304f authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Support "LOCAL_SDK_VERSION := system_current"" into lmp-dev

parents cb3fe9a3 efb93580

core/base_rules.mk

+5 −3
Original line number Diff line number Diff line
@@ -207,12 +207,12 @@ aidl_sources := $(addprefix $(TOP_DIR)$(LOCAL_PATH)/, $(aidl_sources)) 
aidl_preprocess_import :=

LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION))

ifdef LOCAL_SDK_VERSION

ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

ifneq ($(filter current system_current, $(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS)),)

  # LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS

  aidl_preprocess_import := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl

else

  aidl_preprocess_import := $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/framework.aidl

endif # !current

endif # not current or system_current

else

# build against the platform.

LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
@@ -395,9 +395,11 @@ else 
ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

# LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,android_stubs_current)

else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,android_system_stubs_current)

else

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

endif # current

endif # current or system_current

endif # LOCAL_SDK_VERSION

endif # TARGET_

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)

core/config.mk

+2 −1
Original line number Diff line number Diff line
@@ -585,7 +585,8 @@ endef 


TARGET_AVAILABLE_SDK_VERSIONS := $(call numerically_sort,\

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

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

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

    system_current



INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.txt

INTERNAL_PLATFORM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/removed.txt

core/droiddoc.mk

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    # Use android_stubs_current if LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.

    LOCAL_JAVA_LIBRARIES := android_stubs_current $(LOCAL_JAVA_LIBRARIES)

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

  else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)

    LOCAL_JAVA_LIBRARIES := android_system_stubs_current $(LOCAL_JAVA_LIBRARIES)

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

  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))

core/java.mk

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ ifneq ($(LOCAL_SDK_VERSION),) 
      ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

        # Use android_stubs_current if LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.

        LOCAL_JAVA_LIBRARIES := android_stubs_current $(LOCAL_JAVA_LIBRARIES)

      else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)

        LOCAL_JAVA_LIBRARIES := android_system_stubs_current $(LOCAL_JAVA_LIBRARIES)

      else

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

      endif
@@ -142,7 +144,7 @@ renderscript_target_api := $(LOCAL_RENDERSCRIPT_TARGET_API) 
else

ifneq (,$(LOCAL_SDK_VERSION))

# Set target-api for LOCAL_SDK_VERSIONs other than current.

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

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

renderscript_target_api := $(LOCAL_SDK_VERSION)

endif

endif  # LOCAL_SDK_VERSION is set
@@ -158,7 +160,7 @@ renderscript_flags := -Wall -Werror 
renderscript_flags += $(LOCAL_RENDERSCRIPT_FLAGS)



# prepend the RenderScript system include path

ifneq ($(filter-out current,$(LOCAL_SDK_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current,$(LOCAL_SDK_VERSION))),)

ifneq ($(filter-out current system_current,$(LOCAL_SDK_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current system_current,$(LOCAL_SDK_VERSION))),)

# if a numeric LOCAL_SDK_VERSION, or current LOCAL_SDK_VERSION with TARGET_BUILD_APPS

LOCAL_RENDERSCRIPT_INCLUDES := \

    $(HISTORICAL_SDK_VERSIONS_ROOT)/renderscript/clang-include \

core/package_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ include $(BUILD_SYSTEM)/android_manifest.mk 


$(LOCAL_INTERMEDIATE_TARGETS): \

    PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)

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

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

$(LOCAL_INTERMEDIATE_TARGETS): \

    PRIVATE_DEFAULT_APP_TARGET_SDK := $(LOCAL_SDK_VERSION)

else
@@ -282,7 +282,7 @@ else 
# Most packages should link against the resources defined by framework-res.

# Even if they don't have their own resources, they may use framework

# resources.

ifneq ($(filter-out current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current,$(LOCAL_SDK_RES_VERSION))),)

ifneq ($(filter-out current system_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current system_current,$(LOCAL_SDK_RES_VERSION))),)

# for released sdk versions, the platform resources were built into android.jar.

framework_res_package_export := \

    $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_RES_VERSION)/android.jar