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

Commit 6bbcc2cb authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE: Merge Oreo MR1 into master 

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Idcd6eeddfdeec156f0e19e617129561c33d32fdc
parents 2ea4ed59 a363f249

core/Makefile

+18 −9
Original line number Original line Diff line number Diff line
@@ -126,6 +126,9 @@ endif 
# prop.default

# prop.default

ifdef property_overrides_split_enabled

ifdef property_overrides_split_enabled

INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_OUT)/etc/prop.default

INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_OUT)/etc/prop.default

INSTALLED_DEFAULT_PROP_OLD_TARGET := $(TARGET_ROOT_OUT)/default.prop

ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DEFAULT_PROP_OLD_TARGET)

$(INSTALLED_DEFAULT_PROP_OLD_TARGET): $(INSTALLED_DEFAULT_PROP_TARGET)

else

else

# legacy path

# legacy path

INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop

INSTALLED_DEFAULT_PROP_TARGET := $(TARGET_ROOT_OUT)/default.prop
@@ -161,7 +164,7 @@ $(INSTALLED_DEFAULT_PROP_TARGET): $(intermediate_system_build_prop) 
	$(hide) build/tools/post_process_props.py $@

	$(hide) build/tools/post_process_props.py $@

ifdef property_overrides_split_enabled

ifdef property_overrides_split_enabled

	$(hide) mkdir -p $(TARGET_ROOT_OUT)

	$(hide) mkdir -p $(TARGET_ROOT_OUT)

	$(hide) ln -sf system/etc/prop.default $(TARGET_ROOT_OUT)/default.prop

	$(hide) ln -sf system/etc/prop.default $(INSTALLED_DEFAULT_PROP_OLD_TARGET)

endif

endif





# -----------------------------------------------------------------

# -----------------------------------------------------------------
@@ -467,8 +470,10 @@ package-stats: $(PACKAGE_STATS_FILE) 
# -----------------------------------------------------------------

# -----------------------------------------------------------------

# Cert-to-package mapping.  Used by the post-build signing tools.

# Cert-to-package mapping.  Used by the post-build signing tools.

# Use a macro to add newline to each echo command

# Use a macro to add newline to each echo command

define _apkcerts_echo_with_newline

define _apkcerts_write_line

$(hide) echo $(1)

$(hide) echo -n 'name="$(1).apk" certificate="$2" private_key="$3"' >> $5

$(if $(4), $(hide) echo -n ' compressed="$4"' >> $5)

$(hide) echo '' >> $5





endef

endef
@@ -488,12 +493,8 @@ $(APKCERTS_FILE): 
	@rm -f $@

	@rm -f $@

	$(foreach p,$(PACKAGES),\

	$(foreach p,$(PACKAGES),\

	  $(if $(PACKAGES.$(p).EXTERNAL_KEY),\

	  $(if $(PACKAGES.$(p).EXTERNAL_KEY),\

	    $(call _apkcerts_echo_with_newline,\

	    $(call _apkcerts_write_line,$(p),"EXTERNAL","",$(PACKAGES.$(p).COMPRESSED),$@),\

	      'name="$(p).apk" certificate="EXTERNAL" \

	    $(call _apkcerts_write_line,$(p),$(PACKAGES.$(p).CERTIFICATE),$(PACKAGES.$(p).PRIVATE_KEY),$(PACKAGES.$(p).COMPRESSED),$@)))

	      private_key=""' >> $@),\

	    $(call _apkcerts_echo_with_newline,\

	      'name="$(p).apk" certificate="$(PACKAGES.$(p).CERTIFICATE)" \

	      private_key="$(PACKAGES.$(p).PRIVATE_KEY)"' >> $@)))

	# In case value of PACKAGES is empty.

	# In case value of PACKAGES is empty.

	$(hide) touch $@

	$(hide) touch $@
@@ -2082,6 +2083,14 @@ $(INSTALLED_VBMETAIMAGE_TARGET): $(AVBTOOL) $(INSTALLED_BOOTIMAGE_TARGET) $(INST 
vbmetaimage-nodeps:

vbmetaimage-nodeps:

	$(build-vbmetaimage-target)

	$(build-vbmetaimage-target)





else ifeq (true,$(BOARD_BUILD_DISABLED_VBMETAIMAGE))

BUILT_DISABLED_VBMETAIMAGE := $(PRODUCT_OUT)/vbmeta.img



INSTALLED_VBMETAIMAGE_TARGET := $(BUILT_DISABLED_VBMETAIMAGE)

$(INSTALLED_VBMETAIMAGE_TARGET): $(AVBTOOL)

	$(hide) $(AVBTOOL) make_vbmeta_image \

	  --flag 2 --padding_size 4096 --output $@



endif # BOARD_AVB_ENABLE

endif # BOARD_AVB_ENABLE





# -----------------------------------------------------------------

# -----------------------------------------------------------------

core/android_manifest.mk

+3 −1
Original line number Original line Diff line number Diff line
@@ -34,10 +34,12 @@ ifdef my_full_libs_manifest_files 
main_android_manifest := $(full_android_manifest)

main_android_manifest := $(full_android_manifest)

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

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

$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)

$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)

$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)

$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_deps)

$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_deps)

	@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"

	@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"

	@mkdir -p $(dir $@)

	@mkdir -p $(dir $@)

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

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

	    --libs $(call normalize-path-list,$(PRIVATE_LIBS_MANIFESTS)) \

	    --out $@

	    --out $@





endif
 
endif

core/build_id.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# (like "CRB01").  It must be a single word, and is

# capitalized by convention.

# capitalized by convention.





export BUILD_ID=OC-DR1
 
export BUILD_ID=OC-MR1

core/clear_vars.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ LOCAL_CLANG_LDFLAGS:= 
LOCAL_CLASSPATH:=

LOCAL_CLASSPATH:=

LOCAL_COMPATIBILITY_SUITE:=

LOCAL_COMPATIBILITY_SUITE:=

LOCAL_COMPATIBILITY_SUPPORT_FILES:=

LOCAL_COMPATIBILITY_SUPPORT_FILES:=

LOCAL_COMPRESSED_MODULE:=

LOCAL_CONLYFLAGS:=

LOCAL_CONLYFLAGS:=

LOCAL_COPY_HEADERS:=

LOCAL_COPY_HEADERS:=

LOCAL_COPY_HEADERS_TO:=

LOCAL_COPY_HEADERS_TO:=

core/config.mk

+23 −2
Original line number Original line Diff line number Diff line
@@ -685,7 +685,14 @@ FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin 
FINDBUGS := $(FINDBUGS_DIR)/findbugs

FINDBUGS := $(FINDBUGS_DIR)/findbugs





# Tool to merge AndroidManifest.xmls

# Tool to merge AndroidManifest.xmls

ANDROID_MANIFEST_MERGER := $(JAVA) -classpath prebuilts/devtools/tools/lib/manifest-merger.jar com.android.manifmerger.Main merge

ANDROID_MANIFEST_MERGER_CLASSPATH := \

    prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.0.0-beta2/manifest-merger-26.0.0-beta2.jar \

    prebuilts/gradle-plugin/com/android/tools/sdk-common/26.0.0-beta2/sdk-common-26.0.0-beta2.jar \

    prebuilts/gradle-plugin/com/android/tools/common/26.0.0-beta2/common-26.0.0-beta2.jar \

    prebuilts/misc/common/guava/guava-21.0.jar

ANDROID_MANIFEST_MERGER := $(JAVA) \

    -classpath $(subst $(space),:,$(strip $(ANDROID_MANIFEST_MERGER_CLASSPATH))) \

    com.android.manifmerger.Merger





COLUMN:= column

COLUMN:= column
@@ -759,6 +766,14 @@ $(foreach req,$(requirements),$(eval $(req)_OVERRIDE ?=)) 




requirements :=

requirements :=





ifdef PRODUCT_SHIPPING_API_LEVEL

  ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),27),)

    ifneq ($(TARGET_USES_MKE2FS),true)

      $(error When PRODUCT_SHIPPING_API_LEVEL >= 27, TARGET_USES_MKE2FS must be true)

    endif

  endif

endif



# The default key if not set as LOCAL_CERTIFICATE

# The default key if not set as LOCAL_CERTIFICATE

ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE

ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE

  DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE)

  DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE)
@@ -794,8 +809,14 @@ endif 




ifeq ($(strip $(PRODUCT_COMPATIBILITY_MATRIX_LEVEL)),legacy)

ifeq ($(strip $(PRODUCT_COMPATIBILITY_MATRIX_LEVEL)),legacy)

  FRAMEWORK_COMPATIBILITY_MATRIX_FILE := hardware/interfaces/compatibility_matrix.legacy.xml

  FRAMEWORK_COMPATIBILITY_MATRIX_FILE := hardware/interfaces/compatibility_matrix.legacy.xml

else ifeq ($(call math_gt_or_eq,$(PRODUCT_COMPATIBILITY_MATRIX_LEVEL),27),)

else ifeq ($(call math_gt_or_eq,$(PRODUCT_COMPATIBILITY_MATRIX_LEVEL),26),)

  # All PRODUCT_FULL_TREBLE devices with shipping API levels < 26 get the level 26 manifest

  # as that is the first.

  FRAMEWORK_COMPATIBILITY_MATRIX_FILE := hardware/interfaces/compatibility_matrix.26.xml

  FRAMEWORK_COMPATIBILITY_MATRIX_FILE := hardware/interfaces/compatibility_matrix.26.xml

else ifeq ($(call math_gt_or_eq,$(PRODUCT_COMPATIBILITY_MATRIX_LEVEL),28),)

  # All shipping API levels with released compatibility matrices get the corresponding matrix.

  FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \

      hardware/interfaces/compatibility_matrix.$(PRODUCT_COMPATIBILITY_MATRIX_LEVEL).xml

else

else

  FRAMEWORK_COMPATIBILITY_MATRIX_FILE := hardware/interfaces/compatibility_matrix.current.xml

  FRAMEWORK_COMPATIBILITY_MATRIX_FILE := hardware/interfaces/compatibility_matrix.current.xml

endif

endif