Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529 Merged-In: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b Change-Id: I42210485ad8f07e19408bef0e5a2af23f6a0e596
This commit is contained in:
Xin Li
commit
e693b5037e
19 changed files with 151 additions and 64 deletions
|
|
@ -5879,6 +5879,9 @@ endif
|
|||
ifeq ($(TARGET_OTA_ALLOW_NON_AB),true)
|
||||
$(hide) echo "allow_non_ab=true" >> $@
|
||||
endif
|
||||
ifeq ($(BOARD_NON_AB_OTA_DISABLE_COMPRESSION),true)
|
||||
$(hide) echo "board_non_ab_ota_disable_compression=true" >> $@
|
||||
endif
|
||||
ifdef BOARD_PREBUILT_DTBOIMAGE
|
||||
$(hide) echo "has_dtbo=true" >> $@
|
||||
ifeq ($(BOARD_AVB_ENABLE),true)
|
||||
|
|
|
|||
|
|
@ -37,7 +37,12 @@ $(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)
|
|||
# Default behavior for the tree wrt building modules or using prebuilts. This
|
||||
# can always be overridden by setting the environment variable
|
||||
# MODULE_BUILD_FROM_SOURCE.
|
||||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
|
||||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := $(RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE)
|
||||
# TODO(b/301454934): The value from build flag is set to empty when use `False`
|
||||
# The condition below can be removed after the issue get sorted.
|
||||
ifeq (,$(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE))
|
||||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
|
||||
endif
|
||||
|
||||
ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
|
||||
# Always use sources when building the framework with Java coverage or
|
||||
|
|
@ -46,6 +51,18 @@ ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)
|
|||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
|
||||
endif
|
||||
|
||||
ifneq ($(CLANG_COVERAGE)$(NATIVE_COVERAGE_PATHS),)
|
||||
# Always use sources when building with clang coverage and native coverage.
|
||||
# It is possible that there are certain situations when building with coverage
|
||||
# would work with prebuilts, e.g. when the coverage is not being applied to
|
||||
# modules for which we provide prebuilts. Unfortunately, determining that
|
||||
# would require embedding knowledge of which coverage paths affect which
|
||||
# modules here. That would duplicate a lot of information, add yet another
|
||||
# location module authors have to update and complicate the logic here.
|
||||
# For nowe we will just always build from sources when doing coverage builds.
|
||||
BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
|
||||
endif
|
||||
|
||||
# ART does not provide linux_bionic variants needed for products that
|
||||
# set HOST_CROSS_OS=linux_bionic.
|
||||
ifeq (linux_bionic,${HOST_CROSS_OS})
|
||||
|
|
@ -117,6 +134,7 @@ INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \
|
|||
rkpd \
|
||||
uwb \
|
||||
wifi \
|
||||
mediaprovider \
|
||||
|
||||
$(foreach m, $(INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES),\
|
||||
$(if $(call soong_config_get,$(m)_module,source_build),,\
|
||||
|
|
@ -144,8 +162,8 @@ endif
|
|||
SYSTEMUI_OPTIMIZE_JAVA ?= true
|
||||
$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)
|
||||
|
||||
# Disable Compose in SystemUI by default.
|
||||
SYSTEMUI_USE_COMPOSE ?= false
|
||||
# Enable Compose in SystemUI by default.
|
||||
SYSTEMUI_USE_COMPOSE ?= true
|
||||
$(call add_soong_config_var,ANDROID,SYSTEMUI_USE_COMPOSE)
|
||||
|
||||
ifdef PRODUCT_AVF_ENABLED
|
||||
|
|
|
|||
|
|
@ -946,6 +946,11 @@ ifneq ($(TARGET_OTA_ALLOW_NON_AB),true)
|
|||
endif
|
||||
endif
|
||||
|
||||
# For Non A/B full OTA, disable brotli compression.
|
||||
ifeq ($(TARGET_OTA_ALLOW_NON_AB),true)
|
||||
BOARD_NON_AB_OTA_DISABLE_COMPRESSION := true
|
||||
endif
|
||||
|
||||
# Quick check for building generic OTA packages. Currently it only supports A/B OTAs.
|
||||
ifeq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
|
||||
ifneq ($(AB_OTA_UPDATER),true)
|
||||
|
|
|
|||
|
|
@ -1294,7 +1294,7 @@ DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages)
|
|||
include $(BUILD_SYSTEM)/dumpvar.mk
|
||||
|
||||
ifeq (true,$(FULL_SYSTEM_OPTIMIZE_JAVA))
|
||||
ifeq (,$(SYSTEM_OPTIMIZE_JAVA))
|
||||
ifeq (false,$(SYSTEM_OPTIMIZE_JAVA))
|
||||
$(error SYSTEM_OPTIMIZE_JAVA must be enabled when FULL_SYSTEM_OPTIMIZE_JAVA is enabled)
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
41
core/ravenwood_test_config_template.xml
Normal file
41
core/ravenwood_test_config_template.xml
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2023 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.
|
||||
-->
|
||||
<!-- This test config file is auto-generated. -->
|
||||
<configuration description="Runs {MODULE}">
|
||||
<option name="test-suite-tag" value="ravenwood" />
|
||||
<option name="test-suite-tag" value="ravenwood-tests" />
|
||||
|
||||
<option name="java-folder" value="prebuilts/jdk/jdk17/linux-x86/" />
|
||||
<option name="use-ravenwood-resources" value="true" />
|
||||
<option name="exclude-paths" value="java" />
|
||||
<option name="socket-timeout" value="10000" />
|
||||
<option name="null-device" value="true" />
|
||||
|
||||
{EXTRA_CONFIGS}
|
||||
|
||||
<test class="com.android.tradefed.testtype.IsolatedHostTest" >
|
||||
<option name="jar" value="{MODULE}.jar" />
|
||||
<option name="java-flags" value="--add-modules=jdk.compiler"/>
|
||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
|
||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
|
||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
|
||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED"/>
|
||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
|
||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
|
||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
|
||||
<option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
|
||||
</test>
|
||||
</configuration>
|
||||
|
|
@ -144,30 +144,30 @@ $(cts-system-api-xml-coverage-report) : $(android_cts_zip) $(cts_system_api_cove
|
|||
$(call generate-coverage-report-cts,"CTS System API Coverage Report - XML",\
|
||||
$(PRIVATE_TEST_CASES),xml)
|
||||
|
||||
$(cts-verifier-coverage-report): PRIVATE_TEST_CASES := $(cts_verifier_apk)
|
||||
$(cts-verifier-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(verifier-dir), $(c))
|
||||
$(cts-verifier-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe)
|
||||
$(cts-verifier-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe)
|
||||
$(cts-verifier-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description)
|
||||
$(cts-verifier-coverage-report): PRIVATE_NAPI_XML_DESC := $(napi_xml_description)
|
||||
$(cts-verifier-coverage-report) : $(cts_verifier_apk) $(cts_api_coverage_dependencies) | $(ACP)
|
||||
$(cts-verifier-coverage-report) : $(cts_verifier_apk) $(verifier-zip) $(cts_api_coverage_dependencies) | $(ACP)
|
||||
$(call generate-coverage-report-cts,"CTS Verifier API Coverage Report",\
|
||||
$(PRIVATE_TEST_CASES),html)
|
||||
|
||||
$(cts-combined-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(COMPATIBILITY_TESTCASES_OUT_cts), $(c))
|
||||
$(cts-combined-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(COMPATIBILITY_TESTCASES_OUT_cts) $(verifier-dir), $(c))
|
||||
$(cts-combined-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe)
|
||||
$(cts-combined-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe)
|
||||
$(cts-combined-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description)
|
||||
$(cts-combined-coverage-report): PRIVATE_NAPI_XML_DESC := $(napi_xml_description)
|
||||
$(cts-combined-coverage-report) : $(android_cts_zip) $(cts_verifier_apk) $(cts_api_coverage_dependencies) | $(ACP)
|
||||
$(cts-combined-coverage-report) : $(android_cts_zip) $(cts_verifier_apk) $(verifier-zip) $(cts_api_coverage_dependencies) | $(ACP)
|
||||
$(call generate-coverage-report-cts,"CTS Combined API Coverage Report",\
|
||||
$(PRIVATE_TEST_CASES),html)
|
||||
|
||||
$(cts-combined-xml-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(COMPATIBILITY_TESTCASES_OUT_cts), $(c))
|
||||
$(cts-combined-xml-coverage-report): PRIVATE_TEST_CASES := $(foreach c, $(cts_verifier_apk) $(COMPATIBILITY_TESTCASES_OUT_cts) $(verifier-dir), $(c))
|
||||
$(cts-combined-xml-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe)
|
||||
$(cts-combined-xml-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe)
|
||||
$(cts-combined-xml-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description)
|
||||
$(cts-combined-xml-coverage-report): PRIVATE_NAPI_XML_DESC := $(napi_xml_description)
|
||||
$(cts-combined-xml-coverage-report) : $(android_cts_zip) $(cts_verifier_apk) $(cts_api_coverage_dependencies) | $(ACP)
|
||||
$(cts-combined-xml-coverage-report) : $(android_cts_zip) $(cts_verifier_apk) $(verifier-zip) $(cts_api_coverage_dependencies) | $(ACP)
|
||||
$(call generate-coverage-report-cts,"CTS Combined API Coverage Report - XML",\
|
||||
$(PRIVATE_TEST_CASES),xml)
|
||||
|
||||
|
|
@ -236,3 +236,8 @@ dexdeps_exe :=
|
|||
cts_api_coverage_exe :=
|
||||
cts_verifier_apk :=
|
||||
android_cts_zip :=
|
||||
cts-dir :=
|
||||
verifier-dir-name :=
|
||||
verifier-dir :=
|
||||
verifier-zip-name :=
|
||||
verifier-zip :=
|
||||
|
|
|
|||
|
|
@ -92,15 +92,16 @@ PRODUCT_PACKAGES += \
|
|||
ExtShared \
|
||||
flags_health_check \
|
||||
framework-graphics \
|
||||
framework-location \
|
||||
framework-minus-apex \
|
||||
framework-minus-apex-install-dependencies \
|
||||
framework-res \
|
||||
framework-sysconfig.xml \
|
||||
fsck.erofs \
|
||||
fsck_msdos \
|
||||
fsverity-release-cert-der \
|
||||
fs_config_files_system \
|
||||
fs_config_dirs_system \
|
||||
gpu_counter_producer \
|
||||
group_system \
|
||||
gsid \
|
||||
gsi_tool \
|
||||
|
|
@ -234,10 +235,12 @@ PRODUCT_PACKAGES += \
|
|||
perfetto \
|
||||
ping \
|
||||
ping6 \
|
||||
pintool \
|
||||
platform.xml \
|
||||
pm \
|
||||
preinstalled-packages-asl-files.xml \
|
||||
preinstalled-packages-platform.xml \
|
||||
preinstalled-packages-strict-signature.xml \
|
||||
printflags \
|
||||
privapp-permissions-platform.xml \
|
||||
prng_seeder \
|
||||
|
|
@ -258,6 +261,7 @@ PRODUCT_PACKAGES += \
|
|||
services \
|
||||
settings \
|
||||
SettingsProvider \
|
||||
sfdo \
|
||||
sgdisk \
|
||||
Shell \
|
||||
shell_and_utilities_system \
|
||||
|
|
@ -280,7 +284,6 @@ PRODUCT_PACKAGES += \
|
|||
uncrypt \
|
||||
usbd \
|
||||
vdc \
|
||||
viewcompiler \
|
||||
voip-common \
|
||||
vold \
|
||||
watchdogd \
|
||||
|
|
@ -406,7 +409,6 @@ PRODUCT_HOST_PACKAGES += \
|
|||
unwind_info \
|
||||
unwind_reg_info \
|
||||
unwind_symbols \
|
||||
viewcompiler \
|
||||
tzdata_host \
|
||||
tzdata_host_tzdata_apex \
|
||||
tzlookup.xml_host_tzdata_apex \
|
||||
|
|
@ -431,6 +433,7 @@ PRODUCT_PACKAGES_DEBUG := \
|
|||
adevice_fingerprint \
|
||||
arping \
|
||||
dmuserd \
|
||||
evemu-record \
|
||||
idlcli \
|
||||
init-debug.rc \
|
||||
iotop \
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ PRODUCT_PACKAGES += \
|
|||
dumpsys_vendor \
|
||||
fs_config_files_nonsystem \
|
||||
fs_config_dirs_nonsystem \
|
||||
gpu_counter_producer \
|
||||
gralloc.default \
|
||||
group_odm \
|
||||
group_vendor \
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ PRODUCT_TEST_ONLY_ART_BOOT_IMAGE_JARS := \
|
|||
PRODUCT_BOOT_JARS += \
|
||||
framework-minus-apex \
|
||||
framework-graphics \
|
||||
framework-location \
|
||||
ext \
|
||||
telephony-common \
|
||||
voip-common \
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ LLNDK: libvulkan.so
|
|||
VNDK-SP: android.hardware.common-V2-ndk.so
|
||||
VNDK-SP: android.hardware.common.fmq-V1-ndk.so
|
||||
VNDK-SP: android.hardware.graphics.allocator-V2-ndk.so
|
||||
VNDK-SP: android.hardware.graphics.common-V4-ndk.so
|
||||
VNDK-SP: android.hardware.graphics.common-V5-ndk.so
|
||||
VNDK-SP: android.hardware.graphics.common@1.0.so
|
||||
VNDK-SP: android.hardware.graphics.common@1.1.so
|
||||
VNDK-SP: android.hardware.graphics.common@1.2.so
|
||||
|
|
@ -60,8 +60,8 @@ VNDK-SP: libutils.so
|
|||
VNDK-SP: libutilscallstack.so
|
||||
VNDK-SP: libz.so
|
||||
VNDK-core: android.frameworks.cameraservice.common-V1-ndk.so
|
||||
VNDK-core: android.frameworks.cameraservice.device-V1-ndk.so
|
||||
VNDK-core: android.frameworks.cameraservice.service-V1-ndk.so
|
||||
VNDK-core: android.frameworks.cameraservice.device-V2-ndk.so
|
||||
VNDK-core: android.frameworks.cameraservice.service-V2-ndk.so
|
||||
VNDK-core: android.hardware.audio.common@2.0.so
|
||||
VNDK-core: android.hardware.configstore-utils.so
|
||||
VNDK-core: android.hardware.configstore@1.0.so
|
||||
|
|
@ -138,6 +138,7 @@ VNDK-core: libwifi-system-iface.so
|
|||
VNDK-core: libxml2.so
|
||||
VNDK-core: libyuv.so
|
||||
VNDK-core: libziparchive.so
|
||||
VNDK-core: server_configurable_flags.so
|
||||
VNDK-private: libblas.so
|
||||
VNDK-private: libcompiler_rt.so
|
||||
VNDK-private: libft2.so
|
||||
|
|
@ -208,3 +209,4 @@ VNDK-product: libxml2.so
|
|||
VNDK-product: libyuv.so
|
||||
VNDK-product: libz.so
|
||||
VNDK-product: libziparchive.so
|
||||
VNDK-product: server_configurable_flags.so
|
||||
|
|
|
|||
|
|
@ -31,11 +31,7 @@ BUILDING_GSI := true
|
|||
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
|
||||
system/etc/init/config \
|
||||
system/product/% \
|
||||
system/system_ext/% \
|
||||
system/lib/vndk-29 \
|
||||
system/lib/vndk-sp-29 \
|
||||
system/lib64/vndk-29 \
|
||||
system/lib64/vndk-sp-29
|
||||
system/system_ext/%
|
||||
|
||||
# GSI should always support up-to-date platform features.
|
||||
# Keep this value at the latest API level to ensure latest build system
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ PRODUCT_PACKAGES += \
|
|||
VpnDialogs \
|
||||
vr \
|
||||
|
||||
PRODUCT_PACKAGES += $(RELEASE_PACKAGE_VIRTUAL_CAMERA)
|
||||
|
||||
PRODUCT_SYSTEM_SERVER_APPS += \
|
||||
FusedLocation \
|
||||
|
|
|
|||
|
|
@ -27,5 +27,6 @@
|
|||
<install-in user-type="FULL" />
|
||||
<install-in user-type="PROFILE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
|
||||
</install-in-user-type>
|
||||
</config>
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
<install-in user-type="FULL" />
|
||||
<install-in user-type="PROFILE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
|
||||
</install-in-user-type>
|
||||
</config>
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
<install-in user-type="FULL" />
|
||||
<install-in user-type="PROFILE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
|
||||
</install-in-user-type>
|
||||
|
||||
<!-- Camera (Camera2) -->
|
||||
|
|
@ -42,6 +43,7 @@
|
|||
<install-in-user-type package="com.android.deskclock">
|
||||
<install-in user-type="FULL" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
|
||||
</install-in-user-type>
|
||||
|
||||
<!-- Contacts -->
|
||||
|
|
@ -56,6 +58,7 @@
|
|||
<install-in user-type="FULL" />
|
||||
<install-in user-type="PROFILE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
|
||||
</install-in-user-type>
|
||||
|
||||
<!-- Search (QuickSearchBox) TODO(b/258055479) -->
|
||||
|
|
@ -64,6 +67,7 @@
|
|||
<install-in user-type="FULL" />
|
||||
<install-in user-type="PROFILE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
|
||||
</install-in-user-type>
|
||||
|
||||
<!-- WallpaperCropper -->
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
<install-in user-type="FULL" />
|
||||
<install-in user-type="PROFILE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.CLONE" />
|
||||
<do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
|
||||
</install-in-user-type>
|
||||
</config>
|
||||
|
||||
|
|
|
|||
|
|
@ -69,6 +69,33 @@ inline bool IsAtLeast${FINAL_PLATFORM_CODENAME:0:1}() { return android_get_devic
|
|||
rm "$tmpfile"
|
||||
}
|
||||
|
||||
function bumpSdkExtensionsVersion() {
|
||||
local SDKEXT="packages/modules/SdkExtensions/"
|
||||
|
||||
# This used to call bump_sdk.sh utility.
|
||||
# However due to TS, we have to build the gen_sdk with a correct set of settings.
|
||||
|
||||
# "$top/packages/modules/SdkExtensions/gen_sdk/bump_sdk.sh" ${FINAL_MAINLINE_EXTENSION}
|
||||
# Leave the last commit as a set of modified files.
|
||||
# The code to create a finalization topic will pick it up later.
|
||||
# git -C ${SDKEXT} reset HEAD~1
|
||||
|
||||
local sdk="${FINAL_MAINLINE_EXTENSION}"
|
||||
local modules_arg=
|
||||
|
||||
TARGET_PRODUCT=aosp_arm64 \
|
||||
TARGET_RELEASE=fina_1 \
|
||||
TARGET_BUILD_VARIANT=userdebug \
|
||||
DIST_DIR=out/dist \
|
||||
$top/build/soong/soong_ui.bash --make-mode --soong-only gen_sdk
|
||||
|
||||
ANDROID_BUILD_TOP="$top" out/soong/host/linux-x86/bin/gen_sdk \
|
||||
--database ${SDKEXT}/gen_sdk/extensions_db.textpb \
|
||||
--action new_sdk \
|
||||
--sdk "$sdk" \
|
||||
$modules_arg
|
||||
}
|
||||
|
||||
function finalize_aidl_vndk_sdk_resources() {
|
||||
local top="$(dirname "$0")"/../../../..
|
||||
source $top/build/make/tools/finalization/environment.sh
|
||||
|
|
@ -76,9 +103,6 @@ function finalize_aidl_vndk_sdk_resources() {
|
|||
local SDK_CODENAME="public static final int $FINAL_PLATFORM_CODENAME_JAVA = CUR_DEVELOPMENT;"
|
||||
local SDK_VERSION="public static final int $FINAL_PLATFORM_CODENAME_JAVA = $FINAL_PLATFORM_SDK_VERSION;"
|
||||
|
||||
# default target to modify tree and build SDK
|
||||
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug DIST_DIR=out/dist"
|
||||
|
||||
# The full process can be found at (INTERNAL) go/android-sdk-finalization.
|
||||
|
||||
# apply droidstubs hack to prevent tools from incrementing an API version
|
||||
|
|
@ -87,20 +111,12 @@ function finalize_aidl_vndk_sdk_resources() {
|
|||
# bionic/NDK
|
||||
finalize_bionic_ndk
|
||||
|
||||
# VNDK definitions for new SDK version
|
||||
cp "$top/development/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-current.txt" \
|
||||
"$top/development/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-$FINAL_PLATFORM_SDK_VERSION.txt"
|
||||
# pre-finalization build target (trunk)
|
||||
local aidl_m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_RELEASE=trunk TARGET_BUILD_VARIANT=userdebug DIST_DIR=out/dist"
|
||||
AIDL_TRANSITIVE_FREEZE=true $aidl_m aidl-freeze-api
|
||||
|
||||
AIDL_TRANSITIVE_FREEZE=true $m aidl-freeze-api create_reference_dumps
|
||||
|
||||
# Generate ABI dumps
|
||||
ANDROID_BUILD_TOP="$top" out/host/linux-x86/bin/create_reference_dumps
|
||||
|
||||
echo "NOTE: THIS INTENTIONALLY MAY FAIL AND REPAIR ITSELF (until 'DONE')"
|
||||
# Update new versions of files. See update-vndk-list.sh (which requires envsetup.sh)
|
||||
$m check-vndk-list || \
|
||||
{ cp $top/out/soong/vndk/vndk.libraries.txt $top/build/make/target/product/gsi/current.txt; }
|
||||
echo "DONE: THIS INTENTIONALLY MAY FAIL AND REPAIR ITSELF"
|
||||
# TODO(b/309880485)
|
||||
# Add back create_reference_dumps and $top/build/make/target/product/gsi/current.txt
|
||||
|
||||
# Finalize SDK
|
||||
|
||||
|
|
@ -114,9 +130,6 @@ function finalize_aidl_vndk_sdk_resources() {
|
|||
sed -i -e 's/Pkg\.Revision.*/Pkg\.Revision=${PLATFORM_SDK_VERSION}.0.0/g' $build_tools_source
|
||||
|
||||
# build/make
|
||||
local version_defaults="$top/build/make/core/version_defaults.mk"
|
||||
sed -i -e "s/PLATFORM_SDK_VERSION := .*/PLATFORM_SDK_VERSION := ${FINAL_PLATFORM_SDK_VERSION}/g" $version_defaults
|
||||
sed -i -e "s/PLATFORM_VERSION_LAST_STABLE := .*/PLATFORM_VERSION_LAST_STABLE := ${FINAL_PLATFORM_VERSION}/g" $version_defaults
|
||||
sed -i -e "s/sepolicy_major_vers := .*/sepolicy_major_vers := ${FINAL_PLATFORM_SDK_VERSION}/g" "$top/build/make/core/config.mk"
|
||||
cp "$top/build/make/target/product/gsi/current.txt" "$top/build/make/target/product/gsi/$FINAL_PLATFORM_SDK_VERSION.txt"
|
||||
|
||||
|
|
@ -156,18 +169,14 @@ function finalize_aidl_vndk_sdk_resources() {
|
|||
sed -i -e "/=.*$((${FINAL_PLATFORM_SDK_VERSION}-1)),/a \\ SDK_${FINAL_PLATFORM_CODENAME_JAVA} = ${FINAL_PLATFORM_SDK_VERSION}," "$top/frameworks/base/tools/aapt2/SdkConstants.h"
|
||||
|
||||
# Bump Mainline SDK extension version.
|
||||
local SDKEXT="packages/modules/SdkExtensions/"
|
||||
"$top/packages/modules/SdkExtensions/gen_sdk/bump_sdk.sh" ${FINAL_MAINLINE_EXTENSION}
|
||||
# Leave the last commit as a set of modified files.
|
||||
# The code to create a finalization topic will pick it up later.
|
||||
git -C ${SDKEXT} reset HEAD~1
|
||||
bumpSdkExtensionsVersion
|
||||
|
||||
local version_defaults="$top/build/make/core/version_defaults.mk"
|
||||
sed -i -e "s/PLATFORM_SDK_EXTENSION_VERSION := .*/PLATFORM_SDK_EXTENSION_VERSION := ${FINAL_MAINLINE_EXTENSION}/g" $version_defaults
|
||||
# target to build SDK
|
||||
local sdk_m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_RELEASE=fina_1 TARGET_BUILD_VARIANT=userdebug DIST_DIR=out/dist"
|
||||
|
||||
# Force update current.txt
|
||||
$m clobber
|
||||
$m update-api
|
||||
$sdk_m clobber
|
||||
$sdk_m update-api
|
||||
}
|
||||
|
||||
finalize_aidl_vndk_sdk_resources
|
||||
|
|
|
|||
|
|
@ -33,10 +33,6 @@ function finalize_sdk_rel() {
|
|||
# in REL mode, resources would correctly set the resources_sdk_int, no fix required
|
||||
revert_resources_sdk_int_fix
|
||||
|
||||
# build/make/core/version_defaults.mk
|
||||
# Mark all versions "released".
|
||||
sed -i 's/\(PLATFORM_VERSION_CODENAME\.[^[:space:]]*\) := [^[:space:]]*/\1 := REL/g' "$top/build/make/core/version_defaults.mk"
|
||||
|
||||
# cts
|
||||
echo "$FINAL_PLATFORM_VERSION" > "$top/cts/tests/tests/os/assets/platform_versions.txt"
|
||||
if [ "$FINAL_PLATFORM_CODENAME" != "$CURRENT_PLATFORM_CODENAME" ]; then
|
||||
|
|
@ -47,18 +43,19 @@ function finalize_sdk_rel() {
|
|||
# system/sepolicy
|
||||
system/sepolicy/tools/finalize-sdk-rel.sh "$top" "$FINAL_PLATFORM_SDK_VERSION"
|
||||
|
||||
# prebuilts/abi-dumps/ndk
|
||||
mkdir -p "$top/prebuilts/abi-dumps/ndk/$FINAL_PLATFORM_SDK_VERSION"
|
||||
cp -r "$top/prebuilts/abi-dumps/ndk/current/64/" "$top/prebuilts/abi-dumps/ndk/$FINAL_PLATFORM_SDK_VERSION/"
|
||||
|
||||
# prebuilts/abi-dumps/platform
|
||||
mkdir -p "$top/prebuilts/abi-dumps/platform/$FINAL_PLATFORM_SDK_VERSION"
|
||||
cp -r "$top/prebuilts/abi-dumps/platform/current/64/" "$top/prebuilts/abi-dumps/platform/$FINAL_PLATFORM_SDK_VERSION/"
|
||||
|
||||
if [ "$FINAL_STATE" != "sdk" ] || [ "$FINAL_PLATFORM_CODENAME" == "$CURRENT_PLATFORM_CODENAME" ] ; then
|
||||
# TODO(b/309880485)
|
||||
# uncomment and update
|
||||
# prebuilts/abi-dumps/ndk
|
||||
#mkdir -p "$top/prebuilts/abi-dumps/ndk/$FINAL_PLATFORM_SDK_VERSION"
|
||||
#cp -r "$top/prebuilts/abi-dumps/ndk/current/64/" "$top/prebuilts/abi-dumps/ndk/$FINAL_PLATFORM_SDK_VERSION/"
|
||||
#if [ "$FINAL_STATE" != "sdk" ] || [ "$FINAL_PLATFORM_CODENAME" == "$CURRENT_PLATFORM_CODENAME" ] ; then
|
||||
# prebuilts/abi-dumps/vndk
|
||||
mv "$top/prebuilts/abi-dumps/vndk/$CURRENT_PLATFORM_CODENAME" "$top/prebuilts/abi-dumps/vndk/$FINAL_PLATFORM_SDK_VERSION"
|
||||
fi;
|
||||
#mv "$top/prebuilts/abi-dumps/vndk/$CURRENT_PLATFORM_CODENAME" "$top/prebuilts/abi-dumps/vndk/$FINAL_PLATFORM_SDK_VERSION"
|
||||
#fi;
|
||||
}
|
||||
|
||||
finalize_sdk_rel
|
||||
|
|
|
|||
|
|
@ -7,17 +7,17 @@ function finalize_locally() {
|
|||
source $top/build/make/tools/finalization/environment.sh
|
||||
|
||||
# default target to modify tree and build SDK
|
||||
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug DIST_DIR=out/dist"
|
||||
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_RELEASE=fina_1 TARGET_BUILD_VARIANT=userdebug DIST_DIR=out/dist"
|
||||
|
||||
# adb keys
|
||||
$m adb
|
||||
LOGNAME=android-eng HOSTNAME=google.com "$top/out/host/linux-x86/bin/adb" keygen "$top/vendor/google/security/adb/${FINAL_PLATFORM_VERSION}.adb_key"
|
||||
|
||||
# Build Platform SDKs.
|
||||
$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo DIST_DIR=out/dist
|
||||
$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_RELEASE=fina_1 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo DIST_DIR=out/dist
|
||||
|
||||
# Build Modules SDKs.
|
||||
TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true DIST_DIR=out/dist "$top/vendor/google/build/mainline_modules_sdks.sh" --build-release=latest
|
||||
TARGET_RELEASE=fina_1 TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true DIST_DIR=out/dist "$top/vendor/google/build/mainline_modules_sdks.sh" --build-release=latest
|
||||
|
||||
# Update prebuilts.
|
||||
"$top/prebuilts/build-tools/path/linux-x86/python3" -W ignore::DeprecationWarning "$top/prebuilts/sdk/update_prebuilts.py" --local_mode -f ${FINAL_PLATFORM_SDK_VERSION} -e ${FINAL_MAINLINE_EXTENSION} --bug 1 1
|
||||
|
|
|
|||
Loading…
Reference in a new issue