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 a8df6091 to master 

Change-Id: I2d088c09738b34f72c2efa030304fca28ad0e791
This commit is contained in:
Ying Wang 2012-07-23 19:49:48 -07:00
parent 74aa3e49c4 a8df6091fe
commit 9f42af5bbc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@ -126,6 +126,7 @@ LOCAL_CLANG:=
LOCAL_ADDRESS_SANITIZER:= LOCAL_ADDRESS_SANITIZER:=
LOCAL_JAR_EXCLUDE_FILES:= LOCAL_JAR_EXCLUDE_FILES:=
LOCAL_LINT_FLAGS:= LOCAL_LINT_FLAGS:=
LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time. # iterate over thousands of entries every time.

9
core/java.mk
View File

@ -15,8 +15,11 @@ endif #PDK
# Make sure there's something to build. # Make sure there's something to build.
# It's possible to build a package that doesn't contain any classes. # It's possible to build a package that doesn't contain any classes.
ifeq (,$(strip $(LOCAL_SRC_FILES)$(all_res_assets)$(LOCAL_STATIC_JAVA_LIBRARIES))) # LOCAL_SOURCE_FILES_ALL_GENERATED is set only if the module does not have static source files,
$(error $(LOCAL_PATH): Target java module does not define any source or resource 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)))
$(warning $(LOCAL_PATH): Target java module does not define any source or resource files)
endif endif
LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES)) LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES))
@ -232,7 +235,7 @@ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)
# If the module includes java code (i.e., it's not framework-res), compile it. # If the module includes java code (i.e., it's not framework-res), compile it.
full_classes_jar := full_classes_jar :=
built_dex := built_dex :=
ifneq (,$(strip $(all_java_sources)$(full_static_java_libs))) ifneq (,$(strip $(all_java_sources)$(full_static_java_libs))$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)))
# If LOCAL_BUILT_MODULE_STEM wasn't overridden by our caller, # If LOCAL_BUILT_MODULE_STEM wasn't overridden by our caller,
# full_classes_jar will be the same module as LOCAL_BUILT_MODULE. # full_classes_jar will be the same module as LOCAL_BUILT_MODULE.