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

Commit 9235faa9 authored by Anton Hansson's avatar Anton Hansson
Browse files

Switch make over to use the new prebuilt modules. 

There are a couple more places throughout the tree that use the old
modules, and I will update those next before deleting the old module
definitions.

Bug: 77525052
Test: make droid
Change-Id: I9385ae34cc1646cbd4e249d9e96a0116296f139a
parent 0c2a7968

core/config.mk

+21 −15
Original line number Diff line number Diff line
@@ -960,12 +960,19 @@ SUPPORT_LIBRARY_ROOT := frameworks/support 
endif



# Resolve LOCAL_SDK_VERSION to prebuilt module name, e.g.:

# 23 -> sdk_v23

# system_current -> sdk_vsystem_current

# Note: this also replaces core_X with X (to be removed as there are prebuilts for core now).

# 23 -> sdk_public_23_android

# system_current -> sdk_system_current_android

# $(1): An sdk version (LOCAL_SDK_VERSION)

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



# Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N.
@@ -984,17 +991,16 @@ $(shell function sgrax() { \ 
    ( sgrax $(1) | sort -g ) )

endef



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 and core_current SDK yet.

TARGET_AVAILABLE_SDK_VERSIONS := test_current core_current $(TARGET_AVAILABLE_SDK_VERSIONS)

# 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.

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

TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT := $(call numbers_less_than,27,$(TARGET_AVAILABLE_SDK_VERSIONS))

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

  aidl_preprocess_import := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl

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

else

# build against the platform.