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

Commit bf5ad8d9 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Fix handling of LOCAL_JACK_ENABLED 

Change-Id: I5180aa6b685859b7855d0037f38178e906e21bd3
parent d306ab93

core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk

+8 −4
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ LOCAL_SDK_VERSION := current 




LOCAL_PACKAGE_NAME := MultiDexLegacyAndException

LOCAL_PACKAGE_NAME := MultiDexLegacyAndException





LOCAL_DEX_PREOPT := false



mainDexList:= \

mainDexList:= \

    $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

    $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list
@@ -34,15 +36,17 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex 
LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true





ifdef LOCAL_USE_JACK

#################################

include $(BUILD_SYSTEM)/configure_local_jack.mk

#################################



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif

endif





LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





ifndef LOCAL_USE_JACK

ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk

+18 −8
Original line number Original line Diff line number Diff line
@@ -27,21 +27,26 @@ LOCAL_SDK_VERSION := current 




LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp

LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp





LOCAL_DEX_PREOPT := false



mainDexList:= \

mainDexList:= \

	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list





LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

ifdef LOCAL_USE_JACK



#################################

include $(BUILD_SYSTEM)/configure_local_jack.mk

#################################



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif

endif





LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





ifndef LOCAL_USE_JACK

ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
@@ -63,21 +68,26 @@ LOCAL_SDK_VERSION := current 




LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp2

LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp2





LOCAL_DEX_PREOPT := false



mainDexList2:= \

mainDexList2:= \

	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list





LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList2)

LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList2)

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=multidex -D jack.preprocessor=true\

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

ifdef LOCAL_USE_JACK



#################################

include $(BUILD_SYSTEM)/configure_local_jack.mk

#################################



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif

endif





LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





ifndef LOCAL_USE_JACK

ifndef LOCAL_JACK_ENABLED

$(mainDexList2): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

$(mainDexList2): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ LOCAL_DEX_PREOPT := false 




include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





ifndef LOCAL_USE_JACK

ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk

+8 −4
Original line number Original line Diff line number Diff line
@@ -26,6 +26,8 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyVersionedTestApp_v1 




LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex

LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex





LOCAL_DEX_PREOPT := false



mainDexList:= \

mainDexList:= \

	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list
@@ -33,15 +35,17 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex 
LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true





ifdef LOCAL_USE_JACK

#################################

include $(BUILD_SYSTEM)/configure_local_jack.mk

#################################



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif

endif





LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





ifndef LOCAL_USE_JACK

ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk

+8 −4
Original line number Original line Diff line number Diff line
@@ -26,6 +26,8 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyVersionedTestApp_v2 




LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex

LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex





LOCAL_DEX_PREOPT := false



mainDexList:= \

mainDexList:= \

	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list
@@ -33,15 +35,17 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex 
LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true





ifdef LOCAL_USE_JACK

#################################

include $(BUILD_SYSTEM)/configure_local_jack.mk

#################################



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif

endif





LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





ifndef LOCAL_USE_JACK

ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@