openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

resolved conflicts for merge of 9915650b to master 

Change-Id: Ice0f39a84363b76ea37801eb09a1d5cfd79d38fe
This commit is contained in:
Ying Wang 2013-08-28 14:45:37 -07:00
parent fae4541e1a 9915650b98
commit 664a236795
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/base_rules.mk
View File

@ -353,8 +353,11 @@ else
endif # java_resource_file_groups
## PRIVATE java vars ######################################
ifneq ($(strip $(all_java_sources)$(all_res_assets))$(LOCAL_STATIC_JAVA_LIBRARIES)$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)),)
# LOCAL_SOURCE_FILES_ALL_GENERATED is set only if the module does not have static source files,
# but generated source files in its LOCAL_INTERMEDIATE_SOURCE_DIR.
# You have to set up the dependency in some other way.
need_compile_java := $(strip $(all_java_sources)$(all_res_assets))$(LOCAL_STATIC_JAVA_LIBRARIES)$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED))
ifdef need_compile_java
full_static_java_libs := \
$(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \
@ -449,7 +452,7 @@ else
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST :=
endif
endif # PRIVATE java vars
endif # need_compile_java
###########################################################
@ -547,20 +550,16 @@ endif # !LOCAL_UNINSTALLABLE_MODULE
## CHECK_BUILD goals
###########################################################
ifdef java_alternative_checked_module
LOCAL_CHECKED_MODULE := $(java_alternative_checked_module)
endif
# If nobody has defined a more specific module for the
# checked modules, use LOCAL_BUILT_MODULE.
ifndef LOCAL_CHECKED_MODULE
LOCAL_CHECKED_MODULE := $(LOCAL_BUILT_MODULE)
endif
need_compile_java :=
ifdef java_alternative_checked_module
ifneq (,$(strip $(all_java_sources)$(full_static_java_libs))$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)))
need_compile_java := true
LOCAL_CHECKED_MODULE := $(java_alternative_checked_module)
endif
endif
# If they request that this module not be checked, then don't.
# PLEASE DON'T SET THIS. ANY PLACES THAT SET THIS WITHOUT
# GOOD REASON WILL HAVE IT REMOVED.

36
core/java.mk
View File

@ -12,16 +12,6 @@ endif
endif # !PDK_JAVA
endif #PDK
# Make sure there's something to build.
# It's possible to build a package that doesn't contain any classes.
# LOCAL_SOURCE_FILES_ALL_GENERATED is set only if the module does not have static source files,
# but generated source files in its LOCAL_INTERMEDIATE_SOURCE_DIR.
# You have to set up the dependency in some other way.
ifeq (,$(strip $(LOCAL_SRC_FILES)$(all_res_assets)$(LOCAL_STATIC_JAVA_LIBRARIES))$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)))
$(error $(LOCAL_PATH): Target java module does not define any source or resource files)
endif
LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES))
LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION))
@ -117,9 +107,14 @@ full_classes_proguard_jar := $(intermediates.COMMON)/$(proguard_jar_leaf)
built_dex_intermediate := $(intermediates.COMMON)/$(built_dex_intermediate_leaf)/classes.dex
full_classes_stubs_jar := $(intermediates.COMMON)/stubs.jar
# full_classes_jar and built_dex are cleared below, and re-set if we really need them.
ifeq ($(LOCAL_EXPORT_PACKAGE_RESOURCES),true)
# This is framework-res, we don't need to compile any Java code.
full_classes_jar :=
built_dex :=
else
full_classes_jar := $(intermediates.COMMON)/classes.jar
built_dex := $(intermediates.COMMON)/$(built_dex_leaf)/classes.dex
endif
LOCAL_INTERMEDIATE_TARGETS += \
$(full_classes_compiled_jar) \
@ -248,7 +243,11 @@ endif
# to fail except for bugs in their respective tools. If you would
# like to run these rules, add the "all" modifier goal to the make
# command line.
ifdef full_classes_jar
java_alternative_checked_module := $(full_classes_compiled_jar)
else
java_alternative_checked_module :=
endif
# TODO: It looks like the only thing we need from base_rules is
# all_java_sources. See if we can get that by adding a
@ -261,6 +260,13 @@ include $(BUILD_SYSTEM)/base_rules.mk
java_alternative_checked_module :=
# Make sure there's something to build.
ifdef full_classes_jar
ifndef need_compile_java
$(error $(LOCAL_PATH): Target java module does not define any source or resource files)
endif
endif
# Install the RS compatibility libraries to /system/lib/ if necessary
ifdef rs_compatibility_jni_libs
installed_rs_compatibility_jni_libs := $(addprefix $(TARGET_OUT_SHARED_LIBRARIES)/,\
@ -296,11 +302,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): \
# properly.
$(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)
# If the module includes java code (i.e., it's not framework-res), compile it.
full_classes_jar :=
built_dex :=
# need_compile_java is set in base_rules.mk
ifeq ($(need_compile_java),true)
ifdef full_classes_jar
# If LOCAL_BUILT_MODULE_STEM wasn't overridden by our caller,
# full_classes_jar will be the same module as LOCAL_BUILT_MODULE.
@ -512,4 +514,4 @@ $(findbugs_html) : $(findbugs_xml)
$(LOCAL_MODULE)-findbugs : $(findbugs_html)
endif
endif # full_classes_jar is defined

3
core/package.mk
View File

@ -480,3 +480,6 @@ lint-$(LOCAL_PACKAGE_NAME) :
lintall : lint-$(LOCAL_PACKAGE_NAME)
endif # skip_definition
# Reset internal variables.
all_res_assets :=

2
core/static_java_library.mk
View File

@ -126,4 +126,6 @@ endif
endif # $(all_resources) not empty
# Reset internal variables.
all_res_assets :=
LOCAL_IS_STATIC_JAVA_LIBRARY :=