Merge "resolve merge conflicts of e86b78a57404 to master" (db53fb08) · Commits · e / os / android_frameworks_base

Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -561,6 +561,7 @@ LOCAL_PROTOC_FLAGS := \

		LOCAL_MODULE := framework

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

		LOCAL_RMTYPEDEFS := true
		@@ -1411,6 +1412,8 @@ 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

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ 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

+19 −0

Original line number	Diff line number	Diff line
		@@ -31,9 +31,28 @@ 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

+38 −0

Original line number	Diff line number	Diff line
		@@ -29,13 +29,32 @@ 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)

		@@ -51,9 +70,28 @@ 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

+12 −0

Original line number	Diff line number	Diff line
		@@ -26,8 +26,20 @@ 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