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

Commit e7965d4a authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Merge commit '1a510a3c' into... 

Merge "Merge commit '1a510a3c' into manual_merge_1a510a3" into nyc-dev-plus-aosp
parents cdb9a75c c2f612e0

Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := framework-protos 


LOCAL_MODULE := framework



LOCAL_DX_FLAGS := --core-library --multi-dex

LOCAL_JACK_FLAGS := --multi-dex native



LOCAL_RMTYPEDEFS := true
@@ -1221,8 +1220,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform 
LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := ext



LOCAL_DX_FLAGS := --core-library



ifneq ($(INCREMENTAL_BUILDS),)

    LOCAL_PROGUARD_ENABLED := disabled

    LOCAL_JACK_ENABLED := incremental

core/tests/coretests/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ LOCAL_SRC_FILES := \ 
	$(call all-java-files-under, DisabledTestApp/src) \

	$(call all-java-files-under, EnabledTestApp/src)



LOCAL_DX_FLAGS := --core-library

LOCAL_AAPT_FLAGS = -0 dat -0 gld -c fa

LOCAL_STATIC_JAVA_LIBRARIES := \

    core-tests-support \

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

+0 −19
Original line number Diff line number Diff line
@@ -31,28 +31,9 @@ LOCAL_DEX_PREOPT := false 


LOCAL_JAVACFLAGS := -nowarn



mainDexList:= \

    $(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_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



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

include $(BUILD_SYSTEM)/configure_local_jack.mk

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



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif



include $(BUILD_PACKAGE)
 


ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)

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

	$(MAINDEXCLASSES) $< 1>$@

	echo "com/android/multidexlegacyandexception/Test.class" >> $@



$(built_dex_intermediate): $(mainDexList)

endif

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

+0 −38
Original line number Diff line number Diff line
@@ -29,32 +29,13 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp 


LOCAL_DEX_PREOPT := false



mainDexList:= \

	$(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_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



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

include $(BUILD_SYSTEM)/configure_local_jack.mk

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



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif



include $(BUILD_PACKAGE)



ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)

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

	$(MAINDEXCLASSES) $< 1>$@

	echo "com/android/multidexlegacytestapp/Test.class" >> $@



$(built_dex_intermediate): $(mainDexList)

endif



## The application with a full main dex

include $(CLEAR_VARS)
@@ -70,28 +51,9 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp2 


LOCAL_DEX_PREOPT := false



mainDexList2:= \

	$(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_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



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

include $(BUILD_SYSTEM)/configure_local_jack.mk

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



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif



include $(BUILD_PACKAGE)
 


ifndef LOCAL_JACK_ENABLED

$(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)

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

	$(MAINDEXCLASSES) $< 1>$@

	echo "com/android/multidexlegacytestapp/Test.class" >> $@



$(built_dex_intermediate): $(mainDexList2)

endif
 
 No newline at end of file

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

+0 −12
Original line number Diff line number Diff line
@@ -26,20 +26,8 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestServices 


LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex



mainDexList:= \

	$(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_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.dex.output.multidex.legacy=true



LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)
 


ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)

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

	$(MAINDEXCLASSES) $< 1>$@



$(built_dex_intermediate): $(mainDexList)

endif