diff options
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 54bbb68..25564b2 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -106,11 +106,11 @@ endif # Add implicit tags. # # If the local directory or one of its parents contains a MODULE_LICENSE_GPL -# file, tag the module as "gnu". Search for "*_GNU*" so that we can also +# file, tag the module as "gnu". Search for "*_GPL*" and "*_MPL*" so that we can also # find files like MODULE_LICENSE_GPL_AND_AFL but exclude files like # MODULE_LICENSE_LGPL. # -ifneq ($(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*_GPL*),) +ifneq ($(call find-parent-file,$(LOCAL_PATH),MODULE_LICENSE*_GPL* MODULE_LICENSE*_MPL*),) LOCAL_MODULE_TAGS += gnu endif @@ -220,6 +220,9 @@ ifneq ($(strip $(aidl_sources)),) aidl_java_sources := $(patsubst %.aidl,%.java,$(addprefix $(intermediates.COMMON)/src/, $(aidl_sources))) aidl_sources := $(addprefix $(TOP_DIR)$(LOCAL_PATH)/, $(aidl_sources)) +ifeq (,$(TARGET_BUILD_APPS)) +LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) +endif aidl_preprocess_import := LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION)) ifdef LOCAL_SDK_VERSION @@ -413,12 +416,14 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja # to guarantee that the files in full_java_libs will # be up-to-date. ifdef LOCAL_IS_HOST_MODULE -# TODO: make prebuilt java libraries use the same -# intermediates path pattern as target java libraries. ifeq ($(LOCAL_BUILD_HOST_DEX),true) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core-hostdex,$(LOCAL_IS_HOST_MODULE)) + full_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) else +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := + full_java_libs := $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/,$(addsuffix $(COMMON_JAVA_PACKAGE_SUFFIX),$(LOCAL_JAVA_LIBRARIES))) full_java_lib_deps := $(full_java_libs) endif # LOCAL_BUILD_HOST_DEX @@ -449,8 +454,10 @@ ifdef LOCAL_INSTRUMENTATION_FOR full_java_lib_deps += $(link_instr_intermediates_dir.COMMON)/classes.jar endif +jar_manifest_file := ifneq ($(strip $(LOCAL_JAR_MANIFEST)),) -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST := $(LOCAL_PATH)/$(LOCAL_JAR_MANIFEST) +jar_manifest_file := $(LOCAL_PATH)/$(LOCAL_JAR_MANIFEST) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST := $(jar_manifest_file) else $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST := endif @@ -515,7 +522,7 @@ ifndef LOCAL_UNINSTALLABLE_MODULE ifneq ($(LOCAL_ACP_UNAVAILABLE),true) $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) | $(ACP) @echo "Install: $@" - $(copy-file-to-target) + $(copy-file-to-new-target) else $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) @echo "Install: $@" @@ -529,7 +536,7 @@ $(installed_odex) : $(built_odex) | $(ACP) @echo "Install: $@" $(copy-file-to-target) -$(LOCAL_INSTALLED_MODULE) : | $(installed_odex) +$(LOCAL_INSTALLED_MODULE) : $(installed_odex) endif endif # !LOCAL_UNINSTALLABLE_MODULE |