Merge "Move android.hidl.memory@1.0-impl to system_ext" into main
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 00fcb10..b2c4fb5 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -347,10 +347,11 @@
$(call soong_config_set_bool,ci_tests,uses_widevine_tests, true)
endif
-# Check modules to be built in "otatools-package".
-ifneq ($(wildcard vendor/google/tools),)
- $(call soong_config_set_bool,otatools,use_vendor_google_tools,true)
-endif
-ifneq ($(wildcard bootable/deprecated-ota/applypatch),)
- $(call soong_config_set_bool,otatools,use_bootable_deprecated_ota_applypatch,true)
-endif
+# Flags used in GTVS prebuilt apps
+$(call soong_config_set_bool,GTVS,GTVS_COMPRESSED_PREBUILTS,$(if $(findstring $(GTVS_COMPRESSED_PREBUILTS),true yes),true,false))
+$(call soong_config_set_bool,GTVS,GTVS_GMSCORE_BETA,$(if $(findstring $(GTVS_GMSCORE_BETA),true yes),true,false))
+$(call soong_config_set_bool,GTVS,GTVS_SETUPWRAITH_BETA,$(if $(findstring $(GTVS_SETUPWRAITH_BETA),true yes),true,false))
+$(call soong_config_set_bool,GTVS,PRODUCT_USE_PREBUILT_GTVS,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS),true yes),true,false))
+
+# Flags used in GTVS_GTV prebuilt apps
+$(call soong_config_set_bool,GTVS_GTV,PRODUCT_USE_PREBUILT_GTVS_GTV,$(if $(findstring $(PRODUCT_USE_PREBUILT_GTVS_GTV),true yes),true,false))
diff --git a/core/combo/arch/arm64/armv9-3a.mk b/core/combo/arch/arm64/armv9-3a.mk
new file mode 100644
index 0000000..0f2c620
--- /dev/null
+++ b/core/combo/arch/arm64/armv9-3a.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2025 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.
+#
+
+# .mk file required to support build for the ARMv9.3-A arch variant.
+# The file just needs to be present, it does not need to contain anything.
diff --git a/core/combo/arch/arm64/armv9-4a.mk b/core/combo/arch/arm64/armv9-4a.mk
new file mode 100644
index 0000000..6ab3bed
--- /dev/null
+++ b/core/combo/arch/arm64/armv9-4a.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2025 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.
+#
+
+# .mk file required to support build for the ARMv9.4-A arch variant.
+# The file just needs to be present, it does not need to contain anything.
diff --git a/teams/Android.bp b/teams/Android.bp
index 8689267..d5bef59 100644
--- a/teams/Android.bp
+++ b/teams/Android.bp
@@ -2520,7 +2520,7 @@
}
team {
- name: "trendy_team_xr_framework",
+ name: "trendy_team_virtual_device_framework",
// go/trendy/manage/engineers/4798040542445568
trendy_team_id: "4798040542445568",
diff --git a/tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java b/tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java
index 63baf9e..3dd24b2 100644
--- a/tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java
+++ b/tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java
@@ -120,11 +120,11 @@
return aconfigPackage;
} catch (AconfigStorageException e) {
throw new AconfigStorageReadException(
- e.getErrorCode(), "Fail to create AconfigPackage", e);
+ e.getErrorCode(), "Fail to create PlatformAconfigPackage: " + packageName, e);
} catch (Exception e) {
throw new AconfigStorageReadException(
AconfigStorageReadException.ERROR_GENERIC,
- "Fail to create PlatformAconfigPackage",
+ "Fail to create PlatformAconfigPackage: " + packageName,
e);
}
}
diff --git a/tools/otatools_package/Android.bp b/tools/otatools_package/Android.bp
deleted file mode 100644
index d382a65..0000000
--- a/tools/otatools_package/Android.bp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (C) 2025 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.
-
-package {
- // See: http://go/android-license-faq
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-java_genrule_host {
- name: "otatools_package_dep_jars",
- tools: ["soong_zip"],
- compile_multilib: "first",
- cmd: "mkdir -p $(genDir)/framework && " +
- "cp $(in) $(genDir)/framework && " +
- "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)/framework",
- srcs: [
- ":apksigner",
- ":boot_signer",
- ":signapk",
- ":verity_signer",
- ],
- out: ["otatools_package_dep_jars.zip"],
-}
-
-genrule {
- name: "otatools_package_cert_files",
- tools: ["soong_zip"],
- cmd: "mkdir -p $(genDir)/tmp/ && " +
- "echo $(in) > $(genDir)/tmp/zip_files.list && " +
- "$(location soong_zip) -o $(out) -l $(genDir)/tmp/zip_files.list ",
- srcs: [
- ":soong_generated_otatools_package_filegroup",
- ],
- out: ["otatools_package_cert_files.zip"],
-}
-
-cc_genrule {
- name: "otatools_package_dep_libs",
- host_supported: true,
- device_supported: false,
- compile_multilib: "first",
- tools: ["soong_zip"],
- cmd: "mkdir -p $(genDir)/$$CC_MULTILIB &&" +
- "cp $(in) $(genDir)/$$CC_MULTILIB && " +
- "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)/$$CC_MULTILIB",
- srcs: [
- ":libbase",
- ":libbrillo",
- ":libbrillo-stream",
- ":libc++",
- "//external/libchrome:libchrome",
- ":libconscrypt_openjdk_jni",
- ":libcrypto",
- ":libcrypto_utils",
- ":libcutils",
- ":libevent",
- ":libext2_blkid",
- ":libext2_com_err",
- ":libext2_e2p",
- ":libext2_quota",
- ":libext2_uuid",
- ":libext2fs",
- ":libext4_utils",
- ":libfec",
- ":libhidl-gen-utils",
- ":libhidlmetadata",
- ":libicui18n",
- ":libicuuc",
- ":liblog",
- ":liblp",
- ":liblz4",
- ":libpcre2",
- ":libprocessgroup",
- ":libprotobuf-cpp-lite",
- ":libselinux",
- ":libsparse",
- ":libsqlite",
- ":libsquashfs_utils",
- ":libssl",
- ":libz",
- ":libziparchive",
- ],
- out: ["otatools_package_dep_libs.zip"],
-}
-
-cc_genrule {
- name: "otatools_package_dep_bins",
- host_supported: true,
- device_supported: false,
- compile_multilib: "first",
- tools: [
- "apksigner",
- "boot_signer",
- "merge_zips",
- "signapk",
- "verity_signer",
- ],
- cmd: "mkdir -p $(genDir)/bin && " +
- "cp $(in) $(genDir)/bin && " +
- "cp $(location apksigner) $(location boot_signer) $(location merge_zips) $(location signapk) $(location verity_signer) $(genDir)/bin && " +
- "$(location :soong_zip) -o $(out) -C $(genDir) -D $(genDir)/bin",
- srcs: [
- ":aapt2",
- ":add_img_to_target_files",
- ":apex_compression_tool",
- ":apexd_host",
- ":apexer",
- ":append2simg",
- ":avbtool",
- ":blk_alloc_to_base_fs",
- ":brillo_update_payload",
- ":brotli",
- ":bsdiff",
- ":build_image",
- ":build_super_image",
- ":build_verity_metadata",
- ":build_verity_tree",
- ":care_map_generator",
- ":check_ota_package_signature",
- ":check_target_files_signatures",
- ":check_target_files_vintf",
- ":checkvintf",
- ":create_brick_ota",
- ":deapexer",
- ":debugfs_static",
- ":delta_generator",
- ":e2fsck",
- ":e2fsdroid",
- ":fc_sort",
- ":fec",
- ":fs_config",
- ":fsck.erofs",
- ":fsck.f2fs",
- ":generate_verity_key",
- ":host_init_verifier",
- ":img2simg",
- ":img_from_target_files",
- ":initrd_bootconfig",
- ":lpmake",
- ":lpunpack",
- ":lz4",
- ":make_f2fs",
- ":make_f2fs_casefold",
- ":merge_ota",
- ":merge_target_files",
- "//device/generic/goldfish:mk_combined_img",
- ":mkbootfs",
- ":mkbootimg",
- ":mke2fs",
- ":mkf2fsuserimg",
- ":mkfs.erofs",
- ":mksquashfs",
- ":mksquashfsimage",
- ":mkuserimg_mke2fs",
- ":ota_extractor",
- ":ota_from_target_files",
- ":repack_bootimg",
- ":resize2fs",
- ":secilc",
- ":sefcontext_compile",
- ":sgdisk",
- ":shflags",
- ":sign_apex",
- ":sign_target_files_apks",
- ":sign_virt_apex",
- ":simg2img",
- ":sload_f2fs",
- ":soong_zip",
- ":toybox",
- ":tune2fs",
- ":unpack_bootimg",
- ":update_device",
- ":validate_target_files",
- ":verity_verifier",
- ":zip2zip",
- ":zipalign",
- ":zucchini",
- ] + select(soong_config_variable("otatools", "use_vendor_google_tools"), {
- true: [":build_mixed_kernels_ramdisk_host"],
- default: [],
- }) + select(soong_config_variable("otatools", "use_bootable_deprecated_ota_applypatch"), {
- true: [
- ":imgdiff",
- ":update_host_simulator",
- ],
- default: [],
- }),
- out: ["otatools_package_dep_bins.zip"],
-}
-
-java_genrule_host {
- name: "otatools_package",
- tools: ["merge_zips"],
- compile_multilib: "first",
- cmd: "$(location merge_zips) $(out) $(in)",
- srcs: [
- ":otatools_package_cert_files",
- ":otatools_package_dep_bins",
- ":otatools_package_dep_jars",
- ":otatools_package_dep_libs",
- ":otatools_package_releasetools",
- ],
- // TODO: Rename as "otatools.zip" when the rest files are ready.
- out: ["otatools_temp.zip"],
- dist: {
- targets: [
- "otatools-package-temp",
- ],
- },
-}
diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp
index 2232385..3467152 100644
--- a/tools/releasetools/Android.bp
+++ b/tools/releasetools/Android.bp
@@ -650,12 +650,3 @@
unit_test: true,
},
}
-
-genrule {
- name: "otatools_package_releasetools",
- tools: ["soong_zip"],
- srcs: ["**/*"],
- cmd: "find build/make/tools/releasetools -name '*.pyc' -prune -o \\( -type f -o -type l \\) -print | sort > $(genDir)/files.txt && " +
- "$(location soong_zip) -o $(out) -C build/make/tools -l $(genDir)/files.txt",
- out: ["otatools_package_releasetools.zip"],
-}