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

Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules"

Browse Source 
am: e346d8c25e

Change-Id: Ie1b1a4befc9e7f82b58fb91faecb7c49c15c0ad7
This commit is contained in:
Dan Willemsen
2019-06-18 16:07:36 -07:00
committed by android-build-merger
parent 269c12a5b9 e346d8c25e
commit 2ae5ff07fa
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/dex_preopt_odex_install.mk
View File

@@ -105,6 +105,7 @@ endif
my_dexpreopt_archs := my_dexpreopt_archs :=
my_dexpreopt_images := my_dexpreopt_images :=
my_dexpreopt_images_deps :=
my_dexpreopt_infix := boot my_dexpreopt_infix := boot
ifeq (true, $(DEXPREOPT_USE_APEX_IMAGE)) ifeq (true, $(DEXPREOPT_USE_APEX_IMAGE))
my_dexpreopt_infix := apex my_dexpreopt_infix := apex
@@ -143,12 +144,14 @@ ifdef LOCAL_DEX_PREOPT
# Odex for the 1st arch # Odex for the 1st arch
my_dexpreopt_archs += $(TARGET_ARCH) my_dexpreopt_archs += $(TARGET_ARCH)
my_dexpreopt_images += $(DEXPREOPT_IMAGE_$(my_dexpreopt_infix)_$(TARGET_ARCH)) my_dexpreopt_images += $(DEXPREOPT_IMAGE_$(my_dexpreopt_infix)_$(TARGET_ARCH))
my_dexpreopt_images_deps += $(DEXPREOPT_IMAGE_DEPS_$(my_dexpreopt_infix)_$(TARGET_ARCH))
# Odex for the 2nd arch # Odex for the 2nd arch
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true) ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)
ifneq (first,$(my_module_multilib)) ifneq (first,$(my_module_multilib))
my_dexpreopt_archs += $(TARGET_2ND_ARCH) my_dexpreopt_archs += $(TARGET_2ND_ARCH)
my_dexpreopt_images += $(DEXPREOPT_IMAGE_$(my_dexpreopt_infix)_$(TARGET_2ND_ARCH)) my_dexpreopt_images += $(DEXPREOPT_IMAGE_$(my_dexpreopt_infix)_$(TARGET_2ND_ARCH))
my_dexpreopt_images_deps += $(DEXPREOPT_IMAGE_DEPS_$(my_dexpreopt_infix)_$(TARGET_2ND_ARCH))
endif # my_module_multilib is not first. endif # my_module_multilib is not first.
endif # TARGET_TRANSLATE_2ND_ARCH not true endif # TARGET_TRANSLATE_2ND_ARCH not true
endif # TARGET_2ND_ARCH endif # TARGET_2ND_ARCH
@@ -160,6 +163,8 @@ ifdef LOCAL_DEX_PREOPT
my_dexpreopt_archs += $(TARGET_$(my_2nd_arch_prefix)ARCH) my_dexpreopt_archs += $(TARGET_$(my_2nd_arch_prefix)ARCH)
my_dexpreopt_images += \ my_dexpreopt_images += \
$(DEXPREOPT_IMAGE_$(my_dexpreopt_infix)_$(TARGET_$(my_2nd_arch_prefix)ARCH)) $(DEXPREOPT_IMAGE_$(my_dexpreopt_infix)_$(TARGET_$(my_2nd_arch_prefix)ARCH))
my_dexpreopt_images_deps += \
$(DEXPREOPT_IMAGE_DEPS_$(my_dexpreopt_infix)_$(TARGET_$(my_2nd_arch_prefix)ARCH))
ifdef TARGET_2ND_ARCH ifdef TARGET_2ND_ARCH
ifeq ($(my_module_multilib),both) ifeq ($(my_module_multilib),both)
# The non-preferred arch # The non-preferred arch
@@ -167,6 +172,8 @@ ifdef LOCAL_DEX_PREOPT
my_dexpreopt_archs += $(TARGET_$(my_2nd_arch_prefix)ARCH) my_dexpreopt_archs += $(TARGET_$(my_2nd_arch_prefix)ARCH)
my_dexpreopt_images += \ my_dexpreopt_images += \
$(DEXPREOPT_IMAGE_$(my_dexpreopt_infix)_$(TARGET_$(my_2nd_arch_prefix)ARCH)) $(DEXPREOPT_IMAGE_$(my_dexpreopt_infix)_$(TARGET_$(my_2nd_arch_prefix)ARCH))
my_dexpreopt_images_deps += \
$(DEXPREOPT_IMAGE_DEPS_$(my_dexpreopt_infix)_$(TARGET_$(my_2nd_arch_prefix)ARCH))
endif # LOCAL_MULTILIB is both endif # LOCAL_MULTILIB is both
endif # TARGET_2ND_ARCH endif # TARGET_2ND_ARCH
endif # LOCAL_MODULE_CLASS endif # LOCAL_MODULE_CLASS
@@ -263,7 +270,7 @@ ifdef LOCAL_DEX_PREOPT
my_dexpreopt_deps += \ my_dexpreopt_deps += \
$(foreach lib, $(my_dexpreopt_libs), \ $(foreach lib, $(my_dexpreopt_libs), \
$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar) $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar)
my_dexpreopt_deps += $(my_dexpreopt_images) my_dexpreopt_deps += $(my_dexpreopt_images_deps)
my_dexpreopt_deps += $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES) my_dexpreopt_deps += $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)
$(my_dexpreopt_zip): PRIVATE_MODULE := $(LOCAL_MODULE) $(my_dexpreopt_zip): PRIVATE_MODULE := $(LOCAL_MODULE)

4
core/java_common.mk
View File

@@ -416,8 +416,8 @@ ifeq ($(LOCAL_JAVA_LANGUAGE_VERSION),1.9)
ifndef SOONG_SYSTEM_MODULES_$(my_system_modules) ifndef SOONG_SYSTEM_MODULES_$(my_system_modules)
$(call pretty-error, Invalid system modules $(my_system_modules)) $(call pretty-error, Invalid system modules $(my_system_modules))
endif endif
full_java_system_modules_deps := $(SOONG_SYSTEM_MODULES_$(my_system_modules)) full_java_system_modules_deps := $(SOONG_SYSTEM_MODULES_DEPS_$(my_system_modules))
my_system_modules_dir := $(patsubst %/lib/modules,%,$(SOONG_SYSTEM_MODULES_$(my_system_modules))) my_system_modules_dir := $(SOONG_SYSTEM_MODULES_$(my_system_modules))
endif endif
endif endif
endif endif