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

Commit 1b47b69c authored by Xin Li's avatar Xin Li
Browse files

Merge Android R 

Bug: 168057903
Merged-In: I1688ae7c3bb013eed0a3b5fa148811e0d7c50e04
Change-Id: I9e9ef6fa29d6bc519b7c57ad4c3e26c5adf1c08b
parents 897cfaee ab222e8a

CleanSpec.mk

+29 −3
Original line number Diff line number Diff line
@@ -646,6 +646,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libstagefright_soft*) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/odm/build.prop)

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



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



# Remove libcameraservice and libcamera_client from base_system

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcameraservice.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libcamera_client.so)
@@ -685,6 +687,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex) 
# Migrate preopt files to system_other for some devices

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



# Migrate preopt files from system_other for some devices

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



# Remove Android Core Library artifacts from the system partition, now

# that they live in the ART APEX (b/142944799).

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)
@@ -699,9 +704,27 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*) 
# again, as the original change removing them was reverted.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)



# Remove cas@1.1 from the vendor partition

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.cas@1.1*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.cas@1.1*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.cas@1.1*)



# Remove com.android.cellbroadcast apex for Go devices

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.cellbroadcast.apex)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.cellbroadcast)



# Remove CellBroadcastLegacyApp for Go devices

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



# Remove MediaProvider after moving into APEX

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



# The core image variant has been renamed to ""

$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_core*" -print0 | xargs -0 rm -rf)



# Remove 'media' command

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



# Remove CtsShim apks from system partition, since the have been moved inside

# the cts shim apex. Also remove the cts shim apex prebuilt since it has been

# removed in flattened apexs configurations.
@@ -713,6 +736,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.apex.cts.sh 
$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_recovery*" -print0 | xargs -0 rm -rf)

$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_vendor*" -print0 | xargs -0 rm -rf)



# Remove PermissionController after moving into APEX

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



# Clean up VTS-Core and VTS10 related artifacts.

$(call add-clean-step, rm -rf $(HOST_OUT)/vts-core/*)

$(call add-clean-step, rm -rf $(HOST_OUT)/framework/vts-core-tradefed.jar)

core/Makefile

+9 −7
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ endif 
endif



INTERNAL_MKBOOTIMG_VERSION_ARGS := \

    --os_version $(PLATFORM_VERSION) \

    --os_version $(PLATFORM_VERSION_LAST_STABLE) \

    --os_patch_level $(PLATFORM_SECURITY_PATCH)



# Define these only if we are building boot
@@ -1040,6 +1040,8 @@ license_modules := $(filter-out $(TARGET_OUT_FAKE)/%,$(license_modules)) 
license_modules := $(filter-out $(TARGET_OUT_TESTCASES)/%,$(license_modules))

# filesystem images: system, vendor, product, system_ext, odm, vendor_dlkm, and odm_dlkm

license_modules_system := $(filter $(TARGET_OUT)/%,$(license_modules))

# system_other is relevant to system partition.

license_modules_system += $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,$(license_modules))

license_modules_vendor := $(filter $(TARGET_OUT_VENDOR)/%,$(license_modules))

license_modules_product := $(filter $(TARGET_OUT_PRODUCT)/%,$(license_modules))

license_modules_system_ext := $(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(license_modules))
@@ -3126,22 +3128,22 @@ endif 


BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.system.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

    --prop com.android.build.system.os_version:$(PLATFORM_VERSION) \

    --prop com.android.build.system.os_version:$(PLATFORM_VERSION_LAST_STABLE) \

    --prop com.android.build.system.security_patch:$(PLATFORM_SECURITY_PATCH)



BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.product.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

    --prop com.android.build.product.os_version:$(PLATFORM_VERSION) \

    --prop com.android.build.product.os_version:$(PLATFORM_VERSION_LAST_STABLE) \

    --prop com.android.build.product.security_patch:$(PLATFORM_SECURITY_PATCH)



BOARD_AVB_SYSTEM_EXT_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.system_ext.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

    --prop com.android.build.system_ext.os_version:$(PLATFORM_VERSION) \

    --prop com.android.build.system_ext.os_version:$(PLATFORM_VERSION_LAST_STABLE) \

    --prop com.android.build.system_ext.security_patch:$(PLATFORM_SECURITY_PATCH)



BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS += \

    --prop com.android.build.boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

    --prop com.android.build.boot.os_version:$(PLATFORM_VERSION)

    --prop com.android.build.boot.os_version:$(PLATFORM_VERSION_LAST_STABLE)



BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS += \

    --prop com.android.build.vendor_boot.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \
@@ -3151,11 +3153,11 @@ BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS += \ 


BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.vendor.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

    --prop com.android.build.vendor.os_version:$(PLATFORM_VERSION)

    --prop com.android.build.vendor.os_version:$(PLATFORM_VERSION_LAST_STABLE)



BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.odm.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

    --prop com.android.build.odm.os_version:$(PLATFORM_VERSION)

    --prop com.android.build.odm.os_version:$(PLATFORM_VERSION_LAST_STABLE)



BOARD_AVB_VENDOR_DLKM_ADD_HASHTREE_FOOTER_ARGS += \

    --prop com.android.build.vendor_dlkm.fingerprint:$(BUILD_FINGERPRINT_FROM_FILE) \

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) 
# is made which breaks compatibility with the previous platform sepolicy version,

# not just on every increase in PLATFORM_SDK_VERSION.  The minor version should

# be reset to 0 on every bump of the PLATFORM_SDK_VERSION.

sepolicy_major_vers := 29

sepolicy_major_vers := 30

sepolicy_minor_vers := 0



ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

core/definitions.mk

+2 −1
Original line number Diff line number Diff line
@@ -3187,11 +3187,12 @@ endef 


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

## Find system_$(VER) in LOCAL_SDK_VERSION

## note: system_server_* is excluded. It's a different API surface

##

## $(1): LOCAL_SDK_VERSION

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

define has-system-sdk-version

$(filter system_%,$(1))

$(filter-out system_server_%,$(filter system_%,$(1)))

endef



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

core/main.mk

+5 −1
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ $(shell mkdir -p $(EMPTY_DIRECTORY) && rm -rf $(EMPTY_DIRECTORY)/*) 
-include test/mts/tools/build/config.mk

# VTS-Core-specific config.

-include test/vts/tools/vts-core-tradefed/build/config.mk

# CSUITE-specific config.

-include test/app_compat/csuite/tools/build/config.mk



# Clean rules

.PHONY: clean-dex-files
@@ -1794,9 +1796,11 @@ else ifeq (,$(TARGET_BUILD_UNBUNDLED)) 
  # Put XML formatted API files in the dist dir.

  $(TARGET_OUT_COMMON_INTERMEDIATES)/api.xml: $(call java-lib-files,android_stubs_current) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/system-api.xml: $(call java-lib-files,android_system_stubs_current) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/module-lib-api.xml: $(call java-lib-files,android_module_lib_stubs_current) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/system-server-api.xml: $(call java-lib-files,android_system_server_stubs_current) $(APICHECK)

  $(TARGET_OUT_COMMON_INTERMEDIATES)/test-api.xml: $(call java-lib-files,android_test_stubs_current) $(APICHECK)



  api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml test-api.xml)

  api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,api.xml system-api.xml module-lib-api.xml system-server-api.xml test-api.xml)

  $(api_xmls):

	$(hide) echo "Converting API file to XML: $@"

	$(hide) mkdir -p $(dir $@)