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

Commit 66339ad5 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@126645

parent 4f85cc54

buildspec.mk.default

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

# This is a do-nothing template file.  To use it, copy it to a file

# named "buildspec.mk" in the same directory, and uncomment or change

# named "buildspec.mk" in the root directory, and uncomment or change

# the variables necessary for your desired configuration.  The file

# "buildspec.mk" should never be checked in to source control.

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

cleanspec.mk

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ INTERNAL_CLEAN_BUILD_VERSION := 2 
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/etc/NOTICE.html)

# Remove generated java files after CL 126153

$(call add-clean-step, find $(OUT_DIR) -type f -name "*.java" -print0 | xargs -0 rm -f)



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

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

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

core/Makefile

+8 −4
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) 
			BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

	        bash $(BUILDINFO_SH) > $@

	$(hide) if [ -f $(TARGET_DEVICE_DIR)/system.prop ]; then \

	          cat $(TARGET_DEVICE_DIR)/system.prop >> $@; \
@@ -399,6 +400,7 @@ endef 


target_notice_file_txt := $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt

target_notice_file_html := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html

target_notice_file_html_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz

tools_notice_file_txt := $(HOST_OUT_INTERMEDIATES)/NOTICE.txt

tools_notice_file_html := $(HOST_OUT_INTERMEDIATES)/NOTICE.html
@@ -418,15 +420,17 @@ $(eval $(call combine-notice-files, \ 
			$(HOST_OUT_NOTICE_FILES), \

			$(ALL_DEFAULT_INSTALLED_MODULES)))



# Install the html file at /system/NOTICE.html.

# Install the html file at /system/etc/NOTICE.html.gz.

# This is not ideal, but this is very late in the game, after a lot of

# the module processing has already been done -- in fact, we used the

# fact that all that has been done to get the list of modules that we

# need notice files for.

installed_notice_html := $(TARGET_OUT)/etc/NOTICE.html

$(installed_notice_html): $(target_notice_file_html) | $(ACP)

$(target_notice_file_html_gz): $(target_notice_file_html)

	gzip -c $< > $@

installed_notice_html_gz := $(TARGET_OUT)/etc/NOTICE.html.gz

$(installed_notice_html_gz): $(target_notice_file_html_gz) | $(ACP)

	$(copy-file-to-target)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_gz)



# The kernel isn't really a module, so to get its module file in there, we

# make the target NOTICE files depend on this particular file too, which will

core/base_rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ endif 


LOCAL_MODULE_TAGS := $(sort $(LOCAL_MODULE_TAGS))

ifeq (,$(LOCAL_MODULE_TAGS))

# Modules without tags fall back to the default set

LOCAL_MODULE_TAGS := eng user development

# Modules without tags fall back to user (which is changed to user eng below)

LOCAL_MODULE_TAGS := user

#$(warning default tags: $(lastword $(filter-out config/% out/%,$(MAKEFILE_LIST))))

endif

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ LOCAL_ALLOW_UNDEFINED_SYMBOLS:= 
LOCAL_DX_FLAGS:=

LOCAL_CERTIFICATE:=

LOCAL_SDK_VERSION:=

LOCAL_NO_EMMA_INSTRUMENT:=

LOCAL_NO_EMMA_COMPILE:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.