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

Commit cecbd34c authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: I92a002aa926d8d48637e35b26c41ef65026e8eed
Change-Id: I94822b1d4c596806cf27bb3944ea1d0e5d7ac85f
parents b3be1816 ab1d0dc3

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5459,7 +5459,7 @@ ifeq (true,$(CLANG_COVERAGE)) 
  $(PROFDATA_ZIP): $(SOONG_ZIP)

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX)



  $(call dist-for-goals,droidcore-unbundled,$(PROFDATA_ZIP))

  $(call dist-for-goals,droidcore-unbundled apps_only,$(PROFDATA_ZIP))

endif



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

core/android_soong_config_vars.mk

+9 −1
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ $(call add_soong_config_var,ANDROID,BOARD_USES_RECOVERY_AS_BOOT) 
$(call add_soong_config_var,ANDROID,BOARD_BUILD_SYSTEM_ROOT_IMAGE)

$(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)



ifeq (,$(filter com.google.android.conscrypt,$(PRODUCT_PACKAGES)))

  # Prebuilt module SDKs require prebuilt modules to work, and currently

  # prebuilt modules are only provided for com.google.android.xxx. If we can't

  # find one of them in PRODUCT_PACKAGES then assume com.android.xxx are in use,

  # and disable prebuilt SDKs. In particular this applies to AOSP builds.

  MODULE_BUILD_FROM_SOURCE := true

endif



# TODO(b/172480615): Remove when platform uses ART Module prebuilts by default.

ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES)))

  $(call add_soong_config_namespace,art_module)
@@ -75,7 +83,7 @@ else 
  # This sets the default for building ART APEXes from source rather than

  # prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in

  # all other platform builds.

  SOONG_CONFIG_art_module_source_build ?= true

  SOONG_CONFIG_art_module_source_build ?= false

endif



# Apex build mode variables

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,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 := 30

sepolicy_major_vers := 31

sepolicy_minor_vers := 0



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

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ $(shell mkdir -p $(EMPTY_DIRECTORY) && rm -rf $(EMPTY_DIRECTORY)/*) 
-include test/vts/tools/vts-core-tradefed/build/config.mk

# CSUITE-specific config.

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

# CATBox-specific config.

-include test/catbox/tools/build/config.mk

# CTS-Root-specific config.

-include test/cts-root/tools/build/config.mk

core/tasks/catbox.mk

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# Copyright (C) 2021 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



test_suite_name := catbox

test_suite_tradefed := catbox-tradefed

test_suite_readme := test/catbox/tools/catbox-tradefed/README

test_suite_tools := $(HOST_OUT_JAVA_LIBRARIES)/catbox-report-lib.jar



include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk



.PHONY: catbox

catbox: $(compatibility_zip)

$(call dist-for-goals, catbox, $(compatibility_zip))
 
 No newline at end of file