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

Merge changes I0508b2cc,I3d6bbc36

Browse Source 
* changes:
  Don't desugar static java libraries
  Use DEFAULT_APP_TARGET_SDK for dx and desugar
This commit is contained in:
Colin Cross
2017-03-21 19:30:45 +00:00
committed by Gerrit Code Review
parent d69837deea 31060fdde1
commit 767cb900a1
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/definitions.mk
View File

@@ -2513,6 +2513,13 @@ define desugar-classpath
$(filter-out -classpath -bootclasspath "",$(subst :,$(space),$(1))) $(filter-out -classpath -bootclasspath "",$(subst :,$(space),$(1)))
endef endef
# Takes an sdk version that might be PLATFORM_VERSION_CODENAME (for example P),
# returns a number greater than the highest existing sdk version if it is, or
# the input if it is not.
define codename-or-sdk-to-sdk
$(if $(filter $(1),$(PLATFORM_VERSION_CODENAME)),10000,$(1))
endef
define desugar-classes-jar define desugar-classes-jar
@echo Desugar: $@ @echo Desugar: $@
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@@ -2520,7 +2527,7 @@ $(hide) rm -f $@ $@.tmp
$(hide) java -jar $(DESUGAR) \ $(hide) java -jar $(DESUGAR) \
$(addprefix --bootclasspath_entry ,$(call desugar-bootclasspath,$(PRIVATE_BOOTCLASSPATH))) \ $(addprefix --bootclasspath_entry ,$(call desugar-bootclasspath,$(PRIVATE_BOOTCLASSPATH))) \
$(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_LIBRARIES)) \ $(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_LIBRARIES)) \
--min_sdk_version $(PRIVATE_SDK_VERSION) \ --min_sdk_version $(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \
--allow_empty_bootclasspath \ --allow_empty_bootclasspath \
$(if $(filter --core-library,$(PRIVATE_DX_FLAGS)),--core_library) \ $(if $(filter --core-library,$(PRIVATE_DX_FLAGS)),--core_library) \
-i $< -o $@.tmp -i $< -o $@.tmp
@@ -2537,7 +2544,7 @@ $(hide) rm -f $(dir $@)classes*.dex
$(hide) $(DX) \ $(hide) $(DX) \
-JXms16M -JXmx2048M \ -JXms16M -JXmx2048M \
--dex --output=$(dir $@) \ --dex --output=$(dir $@) \
--min-sdk-version=$(PRIVATE_SDK_VERSION) \ --min-sdk-version=$(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \
$(if $(NO_OPTIMIZE_DX), \ $(if $(NO_OPTIMIZE_DX), \
--no-optimize) \ --no-optimize) \
$(if $(GENERATE_DEX_DEBUG), \ $(if $(GENERATE_DEX_DEBUG), \

2
core/java.mk
View File

@@ -456,12 +456,14 @@ javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)
my_desugaring := my_desugaring :=
ifndef LOCAL_JACK_ENABLED ifndef LOCAL_JACK_ENABLED
ifeq ($(LOCAL_JAVA_LANGUAGE_VERSION),1.8) ifeq ($(LOCAL_JAVA_LANGUAGE_VERSION),1.8)
ifndef LOCAL_IS_STATIC_JAVA_LIBRARY
my_desugaring := true my_desugaring := true
$(full_classes_desugar_jar): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) $(full_classes_desugar_jar): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
$(full_classes_desugar_jar): $(full_classes_compiled_jar) $(DESUGAR) $(full_classes_desugar_jar): $(full_classes_compiled_jar) $(DESUGAR)
$(desugar-classes-jar) $(desugar-classes-jar)
endif endif
endif endif
endif
ifndef my_desugaring ifndef my_desugaring
full_classes_desugar_jar := $(full_classes_compiled_jar) full_classes_desugar_jar := $(full_classes_compiled_jar)