StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch make over to use the new prebuilt modules."

Browse Source
This commit is contained in:
Anton Hansson
2018-04-19 08:48:29 +00:00
committed by Gerrit Code Review
parent 7c84a01daf 9235faa9a4
commit 2944c11b1f
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/config.mk
View File

@@ -960,12 +960,19 @@ SUPPORT_LIBRARY_ROOT := frameworks/support
endif endif
# Resolve LOCAL_SDK_VERSION to prebuilt module name, e.g.: # Resolve LOCAL_SDK_VERSION to prebuilt module name, e.g.:
# 23 -> sdk_v23 # 23 -> sdk_public_23_android
# system_current -> sdk_vsystem_current # system_current -> sdk_system_current_android
# Note: this also replaces core_X with X (to be removed as there are prebuilts for core now).
# $(1): An sdk version (LOCAL_SDK_VERSION) # $(1): An sdk version (LOCAL_SDK_VERSION)
define resolve-prebuilt-sdk-module define resolve-prebuilt-sdk-module
sdk_v$(patsubst core_%,%,$(1)) $(if $(findstring _,$(1)),\
sdk_$(1)_android,\
sdk_public_$(1)_android)
endef
# Resolve LOCAL_SDK_VERSION to prebuilt framework.aidl
# $(1): An sdk version (LOCAL_SDK_VERSION)
define resolve-prebuilt-aidl-path
$(HISTORICAL_SDK_VERSIONS_ROOT)/$(subst core_,,$(subst system_,,$(subst test_,,$(1))))/public/framework.aidl
endef endef
# Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N. # Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N.
@@ -984,17 +991,16 @@ $(shell function sgrax() { \
( sgrax $(1) | sort -g ) ) ( sgrax $(1) | sort -g ) )
endef endef
TARGET_AVAILABLE_SDK_VERSIONS := $(call numerically_sort,\ # This produces a list like "current/core current/public current/system 4/public"
$(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/android.jar,%, \ TARGET_AVAILABLE_SDK_VERSIONS := $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/*/android.jar)
$(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.
TARGET_AVAILABLE_SDK_VERSIONS := $(addprefix system_,$(call numerically_sort,\ TARGET_AVAILABLE_SDK_VERSIONS := $(subst /public,,$(TARGET_AVAILABLE_SDK_VERSIONS))
$(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/android_system.jar,%, \ TARGET_AVAILABLE_SDK_VERSIONS := $(patsubst %/core,core_%,$(TARGET_AVAILABLE_SDK_VERSIONS))
$(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/android_system.jar)))) \ TARGET_AVAILABLE_SDK_VERSIONS := $(patsubst %/system,system_%,$(TARGET_AVAILABLE_SDK_VERSIONS))
$(TARGET_AVAILABLE_SDK_VERSIONS) # No prebuilt for test_current.
TARGET_AVAILABLE_SDK_VERSIONS += test_current
# We don't have prebuilt test_current and core_current SDK yet. TARGET_AVAIALBLE_SDK_VERSIONS := $(call numerically_sort,$(TARGET_AVAILABLE_SDK_VERSIONS))
TARGET_AVAILABLE_SDK_VERSIONS := test_current core_current $(TARGET_AVAILABLE_SDK_VERSIONS)
TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT := $(call numbers_less_than,24,$(TARGET_AVAILABLE_SDK_VERSIONS)) TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT := $(call numbers_less_than,24,$(TARGET_AVAILABLE_SDK_VERSIONS))
TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT := $(call numbers_less_than,27,$(TARGET_AVAILABLE_SDK_VERSIONS)) TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT := $(call numbers_less_than,27,$(TARGET_AVAILABLE_SDK_VERSIONS))

2
core/java.mk
View File

@@ -120,7 +120,7 @@ ifneq ($(filter current system_current test_current core_current, $(LOCAL_SDK_VE
# LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS # LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS
aidl_preprocess_import := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl aidl_preprocess_import := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
else else
aidl_preprocess_import := $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_VERSION)/framework.aidl aidl_preprocess_import := $(call resolve-prebuilt-aidl-path,$(LOCAL_SDK_VERSION))
endif # not current or system_current endif # not current or system_current
else else
# build against the platform. # build against the platform.