Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from

oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I7594bb72dd7e847292eb502edd918e41318aac29
Merged-In: Ide82473d358719f7e01cd2a4a85db954f3722f14
This commit is contained in:
Xin Li
2017-11-14 11:36:22 -08:00
64 changed files with 1069 additions and 248 deletions

View File

@@ -31,6 +31,7 @@ LOCAL_BUILT_MODULE_STEM := javalib.jar
# java libraries produce javalib.jar, so we will copy classes.jar there too.
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
common_javalib.jar := $(intermediates.COMMON)/javalib.jar
dex_preopt_profile_src_file := $(common_javalib.jar)
LOCAL_INTERMEDIATE_TARGETS += $(common_javalib.jar)
ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)