From 37b82aacd958ee5b820d0058a808e8f13e9b22bb Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 28 Aug 2013 17:28:36 -0700 Subject: [PATCH] Skip compiling Java if an apk has no Java code. Change-Id: Iee204e03ad5bc8ce5c3b4b3863c19c89184826e2 --- core/java.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java.mk b/core/java.mk index 4814a9a8c..76f0c6c19 100644 --- a/core/java.mk +++ b/core/java.mk @@ -107,8 +107,8 @@ full_classes_proguard_jar := $(intermediates.COMMON)/$(proguard_jar_leaf) built_dex_intermediate := $(intermediates.COMMON)/$(built_dex_intermediate_leaf) full_classes_stubs_jar := $(intermediates.COMMON)/stubs.jar -ifeq ($(LOCAL_EXPORT_PACKAGE_RESOURCES),true) -# This is framework-res, we don't need to compile any Java code. +ifeq ($(LOCAL_MODULE_CLASS)$(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_GENERATED),APPS) +# If this is an apk without any Java code (e.g. framework-res), we should skip compiling Java. full_classes_jar := built_dex := else