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

Commit 13466f0f authored by Bill Yi's avatar Bill Yi
Browse files

Merge commit '66b3e319' into HEAD

parents c6a12d77 66b3e319

.gitignore

+1 −0
Original line number Diff line number Diff line 
*.pyc

*.swp

CleanSpec.mk

+49 −0
Original line number Diff line number Diff line
@@ -200,6 +200,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DMService.apk) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/SprintDM.apk)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/omadm)



# GCC 4.8

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/EXECUTABLES)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/*.o)



# KLP I mean KitKat now API 19.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
@@ -211,11 +217,34 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# 4.4.2

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# "L" and beyond.

# Make libart the default runtime

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# Rename persist.sys.dalvik.vm.lib to allow new default

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# KKWT development

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# L development

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# L development

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# Add ro.product.cpu.abilist{32,64} to build.prop.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# Unset TARGET_PREFER_32_BIT_APPS for 64 bit targets.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# Adding dalvik.vm.dex2oat-flags to eng builds

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
@@ -236,6 +265,14 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
# Switching to 32-bit-by-default host multilib build

$(call add-clean-step, rm -rf $(HOST_OUT_INTERMEDIATES))



# KKWT has become API 20

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# ims-common.jar added to BOOTCLASSPATH

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/ETC/init.environ.rc_intermediates)



# Change ro.zygote for core_64_bit.mk from zygote32_64 to zygote64_32

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
@@ -245,6 +282,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system)



# Switch host builds to Clang by default

$(call add-clean-step, rm -rf $(OUT_DIR)/host)
@@ -253,6 +292,16 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)



# API 21?

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



# API 21!

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)



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

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

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

core/Makefile

+205 −58

File changed.

Preview size limit exceeded, changes collapsed.

core/android_manifest.mk

0 → 100644
+25 −0
Original line number Diff line number Diff line 
# Handle AndroidManifest.xmls

# Input: LOCAL_MANIFEST_FILE, LOCAL_FULL_MANIFEST_FILE, LOCAL_FULL_LIBS_MANIFEST_FILES

# Output: full_android_manifest



ifeq ($(strip $(LOCAL_MANIFEST_FILE)),)

  LOCAL_MANIFEST_FILE := AndroidManifest.xml

endif

ifdef LOCAL_FULL_MANIFEST_FILE

  full_android_manifest := $(LOCAL_FULL_MANIFEST_FILE)

else

  full_android_manifest := $(LOCAL_PATH)/$(LOCAL_MANIFEST_FILE)

endif



# Set up rules to merge library manifest files

ifdef LOCAL_FULL_LIBS_MANIFEST_FILES

main_android_manifest := $(full_android_manifest)

full_android_manifest := $(intermediates.COMMON)/AndroidManifest.xml

$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(LOCAL_FULL_LIBS_MANIFEST_FILES)

$(full_android_manifest) : $(main_android_manifest) $(LOCAL_FULL_LIBS_MANIFEST_FILES)

	@echo "Merge android manifest files: $@ <-- $^"

	@mkdir -p $(dir $@)

	$(hide) $(ANDROID_MANIFEST_MERGER) --main $< --libs $(PRIVATE_LIBS_MANIFESTS) \

	    --out $@



endif

core/apicheck_msg_current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ To make these errors go away, you have two choices: 
      errors above.



   2) You can update current.txt by executing the following command:

         make update-api

         make %UPDATE_API%



      To submit the revised current.txt to the main Android repository,

      you will need approval.