Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c07cf9a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Merge korg/donut into korg/master 

Conflicts:

	core/apicheck_msg_current.txt
	core/combo/linux-arm.mk
	core/prelink-linux-arm.map
	tools/droiddoc/src/ClassInfo.java
parents 6c8cafac 8cebf1ff

cleanspec.mk

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.an 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PinyinIMEGoogleService_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.inputmethod.pinyin.lib_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/PinyinIMEGoogleService_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj)

$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/bin/tcpdump)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/location)



$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/lib?camera_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/STATIC_LIBRARIES/lib?camera_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libwebcore_intermediates)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/Makefile

+203 −214

File changed.

Preview size limit exceeded, changes collapsed.

core/base_rules.mk

+2 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ full_static_java_libs := \ 
        JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE))/javalib.jar)



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_INSTALL_DIR := $(dir $(LOCAL_INSTALLED_MODULE))

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_INTERMEDIATES_DIR := $(intermediates)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates)/classes

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(intermediates)/src

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources)
@@ -357,6 +356,8 @@ $(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JAVA_LIBRARIES:= $(full_java_libs) 
$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_IS_HOST_MODULE := $(LOCAL_IS_HOST_MODULE)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_HOST:= $(my_host)



$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_INTERMEDIATES_DIR:= $(intermediates)



# Tell the module and all of its sub-modules who it is.

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_MODULE:= $(LOCAL_MODULE)

core/binary.mk

+18 −5
Original line number Diff line number Diff line
@@ -47,11 +47,11 @@ LOCAL_ARM_MODE := $(strip $(LOCAL_ARM_MODE)) 
arm_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),arm)

normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb)



# Read the values from something like TARGET_arm_release_CFLAGS or

# TARGET_thumb_debug_CFLAGS.  HOST_(arm|thumb)_(release|debug)_CFLAGS

# values aren't actually used (although they are usually empty).

arm_objects_cflags := $($(my_prefix)$(arm_objects_mode)_$($(my_prefix)BUILD_TYPE)_CFLAGS)

normal_objects_cflags := $($(my_prefix)$(normal_objects_mode)_$($(my_prefix)BUILD_TYPE)_CFLAGS)

# Read the values from something like TARGET_arm_CFLAGS or

# TARGET_thumb_CFLAGS.  HOST_(arm|thumb)_CFLAGS values aren't

# actually used (although they are usually empty).

arm_objects_cflags := $($(my_prefix)$(arm_objects_mode)_CFLAGS)

normal_objects_cflags := $($(my_prefix)$(normal_objects_mode)_CFLAGS)



###########################################################

## Define per-module debugging flags.  Users can turn on
@@ -211,6 +211,19 @@ $(c_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.c $(yacc_cpps) $(PR 
-include $(c_objects:%.o=%.P)

endif



###########################################################

## ObjC: Compile .m files to .o

###########################################################



objc_sources := $(filter %.m,$(LOCAL_SRC_FILES))

objc_objects := $(addprefix $(intermediates)/,$(objc_sources:.m=.o))



ifneq ($(strip $(objc_objects)),)

$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m $(yacc_cpps) $(PRIVATE_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)m-to-o)

-include $(objc_objects:%.o=%.P)

endif



###########################################################

## AS: Compile .S files to .o.

###########################################################

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# (like "TC1-RC5").  It must be a single word, and is

# capitalized by convention.

#

BUILD_ID := CUPCAKE

BUILD_ID := Donut



# DISPLAY_BUILD_NUMBER should only be set for development branches,

# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for