Merge "Add script that dumps all product config varaibles." into main
diff --git a/ci/build_metadata b/ci/build_metadata
new file mode 100755
index 0000000..8136702
--- /dev/null
+++ b/ci/build_metadata
@@ -0,0 +1,25 @@
+#/bin/bash
+
+# Copyright 2024, 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.
+
+set -ex
+
+export TARGET_PRODUCT=aosp_arm64
+export TARGET_RELEASE=trunk_staging
+export TARGET_BUILD_VARIANT=eng
+
+build/soong/bin/m dist \
+ code_metadata
+
diff --git a/core/Makefile b/core/Makefile
index e57c1d3..bf2d48a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6812,14 +6812,22 @@
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
$(hide) cp $(INSTALLED_DTBOIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
endif # BOARD_PREBUILT_DTBOIMAGE
-ifdef BUILT_KERNEL_16K_TARGET
+ifdef BOARD_KERNEL_PATH_16K
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
$(hide) cp $(BUILT_KERNEL_16K_TARGET) $(zip_root)/PREBUILT_IMAGES/
-endif # BUILT_KERNEL_16K_TARGET
-ifdef BUILT_RAMDISK_16K_TARGET
+endif # BOARD_KERNEL_PATH_16K
+ifdef BOARD_KERNEL_MODULES_16K
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
$(hide) cp $(BUILT_RAMDISK_16K_TARGET) $(zip_root)/PREBUILT_IMAGES/
-endif # BUILT_RAMDISK_16K_TARGET
+endif # BOARD_KERNEL_MODULES_16K
+ifdef BUILT_BOOTIMAGE_16K_TARGET
+ $(hide) mkdir -p $(zip_root)/IMAGES
+ $(hide) cp $(BUILT_BOOTIMAGE_16K_TARGET) $(zip_root)/IMAGES/
+endif # BUILT_BOOTIMAGE_16K_TARGET
+ifdef INSTALLED_DTBOIMAGE_16KB_TARGET
+ $(hide) mkdir -p $(zip_root)/IMAGES
+ $(hide) cp $(INSTALLED_DTBOIMAGE_16KB_TARGET) $(zip_root)/IMAGES/
+endif # INSTALLED_DTBOIMAGE_16KB_TARGET
ifeq ($(BOARD_USES_PVMFWIMAGE),true)
$(hide) mkdir -p $(zip_root)/PREBUILT_IMAGES
$(hide) cp $(INSTALLED_PVMFWIMAGE_TARGET) $(zip_root)/PREBUILT_IMAGES/
diff --git a/core/config.mk b/core/config.mk
index 76ad361..a294223 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -811,6 +811,12 @@
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED ?= true
endif
+ifneq ($(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),36),)
+ ifneq ($(NEED_AIDL_NDK_PLATFORM_BACKEND),)
+ $(error Must not set NEED_AIDL_NDK_PLATFORM_BACKEND, but it is set to: $(NEED_AIDL_NDK_PLATFORM_BACKEND). Support will be removed.)
+ endif
+endif
+
# Set BOARD_SYSTEMSDK_VERSIONS to the latest SystemSDK version starting from P-launching
# devices if unset.
ifndef BOARD_SYSTEMSDK_VERSIONS
diff --git a/core/soong_android_app_set.mk b/core/soong_android_app_set.mk
index ec3d8c8..d97980d 100644
--- a/core/soong_android_app_set.mk
+++ b/core/soong_android_app_set.mk
@@ -9,10 +9,6 @@
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_INSTALLED_MODULE_STEM := $(notdir $(LOCAL_PREBUILT_MODULE_FILE))
-# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
-# to avoid checkbuilds making an extra copy of every module.
-LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)
-
#######################################
include $(BUILD_SYSTEM)/base_rules.mk
#######################################
diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index 3aa244c..df1cf2d 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -29,16 +29,6 @@
full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
-# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
-# to avoid checkbuilds making an extra copy of every module.
-LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_CLASSES_JAR)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_HEADER_JAR)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_FULL_MANIFEST_FILE)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_DEXPREOPT_CONFIG)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_DEX_JAR)
-
#######################################
include $(BUILD_SYSTEM)/base_rules.mk
#######################################
diff --git a/core/soong_cc_rust_prebuilt.mk b/core/soong_cc_rust_prebuilt.mk
index a1c6478..da60832 100644
--- a/core/soong_cc_rust_prebuilt.mk
+++ b/core/soong_cc_rust_prebuilt.mk
@@ -38,10 +38,6 @@
endif
endif
-# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
-# to avoid checkbuilds making an extra copy of every module.
-LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)
-
my_check_same_vndk_variants :=
same_vndk_variants_stamp :=
ifeq ($(LOCAL_CHECK_SAME_VNDK_VARIANTS),true)
@@ -61,7 +57,7 @@
# Note that because `checkbuild` doesn't check LOCAL_BUILT_MODULE for soong-built modules adding
# the timestamp to LOCAL_BUILT_MODULE isn't enough. It is skipped when the vendor variant
# isn't used at all and it may break in the downstream trees.
- LOCAL_ADDITIONAL_CHECKED_MODULE := $(same_vndk_variants_stamp)
+ LOCAL_ADDITIONAL_CHECKED_MODULE += $(same_vndk_variants_stamp)
endif
#######################################
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 2e7cd9f..a018c9b 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -357,6 +357,11 @@
$(call add_json_str, EnableUffdGc, $(_config_enable_uffd_gc))
_config_enable_uffd_gc :=
+$(call add_json_list, DeviceFrameworkCompatibilityMatrixFile, $(DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE))
+$(call add_json_list, DeviceProductCompatibilityMatrixFile, $(DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE))
+$(call add_json_list, BoardAvbSystemAddHashtreeFooterArgs, $(BOARD_AVB_SYSTEM_ADD_HASHTREE_FOOTER_ARGS))
+$(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))
+
$(call json_end)
$(file >$(SOONG_VARIABLES).tmp,$(json_contents))
diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index f74bb6d..8c3882f 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -21,19 +21,6 @@
full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
common_javalib.jar := $(intermediates.COMMON)/javalib.jar
-ifdef LOCAL_SOONG_AAR
- LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_AAR)
-endif
-
-# Use the Soong output as the checkbuild target instead of LOCAL_BUILT_MODULE
-# to avoid checkbuilds making an extra copy of every module.
-LOCAL_CHECKED_MODULE := $(LOCAL_PREBUILT_MODULE_FILE)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_HEADER_JAR)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_FULL_MANIFEST_FILE)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_DEXPREOPT_CONFIG)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE)
-LOCAL_ADDITIONAL_CHECKED_MODULE += $(LOCAL_SOONG_DEX_JAR)
-
#######################################
include $(BUILD_SYSTEM)/base_rules.mk
#######################################
diff --git a/core/tasks/tradefed-tests-list.mk b/core/tasks/tradefed-tests-list.mk
index 61bf136..47c360d 100644
--- a/core/tasks/tradefed-tests-list.mk
+++ b/core/tasks/tradefed-tests-list.mk
@@ -15,6 +15,11 @@
# List all TradeFed tests from COMPATIBILITY.tradefed_tests_dir
.PHONY: tradefed-tests-list
+COMPATIBILITY.tradefed_tests_dir := \
+ $(COMPATIBILITY.tradefed_tests_dir) \
+ tools/tradefederation/core/res/config \
+ tools/tradefederation/core/javatests/res/config
+
tradefed_tests :=
$(foreach dir, $(COMPATIBILITY.tradefed_tests_dir), \
$(eval tradefed_tests += $(shell find $(dir) -type f -name "*.xml")))
diff --git a/target/product/base_product.mk b/target/product/base_product.mk
index 92fc420..acfc653 100644
--- a/target/product/base_product.mk
+++ b/target/product/base_product.mk
@@ -26,3 +26,7 @@
product_manifest.xml \
selinux_policy_product \
product-build.prop \
+
+# Packages included only for eng or userdebug builds, previously debug tagged
+PRODUCT_PACKAGES_DEBUG += \
+ adb_keys \
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5b54051..9e34538 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -466,7 +466,6 @@
# Packages included only for eng or userdebug builds, previously debug tagged
PRODUCT_PACKAGES_DEBUG := \
- adb_keys \
adevice_fingerprint \
arping \
dmuserd \
diff --git a/target/product/security/Android.mk b/target/product/security/Android.mk
index 91b272c..138e5bb 100644
--- a/target/product/security/Android.mk
+++ b/target/product/security/Android.mk
@@ -10,7 +10,7 @@
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE
LOCAL_MODULE_CLASS := ETC
- LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
+ LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/security
LOCAL_PREBUILT_MODULE_FILE := $(PRODUCT_ADB_KEYS)
include $(BUILD_PREBUILT)
endif
diff --git a/tools/aconfig/aconfig/src/codegen/rust.rs b/tools/aconfig/aconfig/src/codegen/rust.rs
index 16f9f2c..6f3f7bf 100644
--- a/tools/aconfig/aconfig/src/codegen/rust.rs
+++ b/tools/aconfig/aconfig/src/codegen/rust.rs
@@ -113,6 +113,7 @@
use aconfig_storage_read_api::{Mmap, AconfigStorageError, StorageFileType, PackageReadContext, get_mapped_storage_file, get_boolean_flag_value, get_package_read_context};
use std::path::Path;
use std::io::Write;
+use std::sync::LazyLock;
use log::{log, LevelFilter, Level};
static STORAGE_MIGRATION_MARKER_FILE: &str =
@@ -123,36 +124,28 @@
pub struct FlagProvider;
/// flag value cache for disabled_rw
-lazy_static::lazy_static! {
- static ref CACHED_disabled_rw: bool = flags_rust::GetServerConfigurableFlag(
+ static CACHED_disabled_rw: LazyLock<bool> = LazyLock::new(|| flags_rust::GetServerConfigurableFlag(
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw",
- "false") == "true";
-}
+ "false") == "true");
/// flag value cache for disabled_rw_exported
-lazy_static::lazy_static! {
- static ref CACHED_disabled_rw_exported: bool = flags_rust::GetServerConfigurableFlag(
+ static CACHED_disabled_rw_exported: LazyLock<bool> = LazyLock::new(|| flags_rust::GetServerConfigurableFlag(
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw_exported",
- "false") == "true";
-}
+ "false") == "true");
/// flag value cache for disabled_rw_in_other_namespace
-lazy_static::lazy_static! {
- static ref CACHED_disabled_rw_in_other_namespace: bool = flags_rust::GetServerConfigurableFlag(
+ static CACHED_disabled_rw_in_other_namespace: LazyLock<bool> = LazyLock::new(|| flags_rust::GetServerConfigurableFlag(
"aconfig_flags.other_namespace",
"com.android.aconfig.test.disabled_rw_in_other_namespace",
- "false") == "true";
-}
+ "false") == "true");
/// flag value cache for enabled_rw
-lazy_static::lazy_static! {
- static ref CACHED_enabled_rw: bool = flags_rust::GetServerConfigurableFlag(
+ static CACHED_enabled_rw: LazyLock<bool> = LazyLock::new(|| flags_rust::GetServerConfigurableFlag(
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_rw",
- "true") == "true";
-}
+ "true") == "true");
impl FlagProvider {
/// query flag disabled_ro
@@ -264,6 +257,7 @@
use aconfig_storage_read_api::{Mmap, AconfigStorageError, StorageFileType, PackageReadContext, get_mapped_storage_file, get_boolean_flag_value, get_package_read_context};
use std::path::Path;
use std::io::Write;
+use std::sync::LazyLock;
use log::{log, LevelFilter, Level};
static STORAGE_MIGRATION_MARKER_FILE: &str =
@@ -273,285 +267,276 @@
/// flag provider
pub struct FlagProvider;
-lazy_static::lazy_static! {
- static ref PACKAGE_OFFSET: Result<Option<u32>, AconfigStorageError> = unsafe {
- get_mapped_storage_file("system", StorageFileType::PackageMap)
- .and_then(|package_map| get_package_read_context(&package_map, "com.android.aconfig.test"))
- .map(|context| context.map(|c| c.boolean_start_index))
- };
+static PACKAGE_OFFSET: LazyLock<Result<Option<u32>, AconfigStorageError>> = LazyLock::new(|| unsafe {
+ get_mapped_storage_file("system", StorageFileType::PackageMap)
+ .and_then(|package_map| get_package_read_context(&package_map, "com.android.aconfig.test"))
+ .map(|context| context.map(|c| c.boolean_start_index))
+});
- static ref FLAG_VAL_MAP: Result<Mmap, AconfigStorageError> = unsafe {
- get_mapped_storage_file("system", StorageFileType::FlagVal)
- };
-}
+static FLAG_VAL_MAP: LazyLock<Result<Mmap, AconfigStorageError>> = LazyLock::new(|| unsafe {
+ get_mapped_storage_file("system", StorageFileType::FlagVal)
+});
- /// flag value cache for disabled_rw
-lazy_static::lazy_static! {
- static ref CACHED_disabled_rw: bool = {
- let result = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.aconfig_test",
- "com.android.aconfig.test.disabled_rw",
- "false") == "true";
+/// flag value cache for disabled_rw
+static CACHED_disabled_rw: LazyLock<bool> = LazyLock::new(|| {
+ let result = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.aconfig_test",
+ "com.android.aconfig.test.disabled_rw",
+ "false") == "true";
- let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.core_experiments_team_internal",
- "com.android.providers.settings.use_new_storage_value",
- "false") == "true";
+ let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.core_experiments_team_internal",
+ "com.android.providers.settings.use_new_storage_value",
+ "false") == "true";
- if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() {
- // This will be called multiple times. Subsequent calls after the first are noops.
- logger::init(
- logger::Config::default()
- .with_tag_on_device(MIGRATION_LOG_TAG)
- .with_max_level(LevelFilter::Info));
+ if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() {
+ // This will be called multiple times. Subsequent calls after the first are noops.
+ logger::init(
+ logger::Config::default()
+ .with_tag_on_device(MIGRATION_LOG_TAG)
+ .with_max_level(LevelFilter::Info));
- let aconfig_storage_result = FLAG_VAL_MAP
- .as_ref()
- .map_err(|err| format!("failed to get flag val map: {err}"))
- .and_then(|flag_val_map| {
- PACKAGE_OFFSET
- .as_ref()
- .map_err(|err| format!("failed to get package read offset: {err}"))
- .and_then(|package_offset| {
- match package_offset {
- Some(offset) => {
- get_boolean_flag_value(&flag_val_map, offset + 1)
- .map_err(|err| format!("failed to get flag: {err}"))
- },
- None => Err("no context found for package 'com.android.aconfig.test'".to_string())
- }
- })
- });
+ let aconfig_storage_result = FLAG_VAL_MAP
+ .as_ref()
+ .map_err(|err| format!("failed to get flag val map: {err}"))
+ .and_then(|flag_val_map| {
+ PACKAGE_OFFSET
+ .as_ref()
+ .map_err(|err| format!("failed to get package read offset: {err}"))
+ .and_then(|package_offset| {
+ match package_offset {
+ Some(offset) => {
+ get_boolean_flag_value(&flag_val_map, offset + 1)
+ .map_err(|err| format!("failed to get flag: {err}"))
+ },
+ None => Err("no context found for package 'com.android.aconfig.test'".to_string())
+ }
+ })
+ });
- match aconfig_storage_result {
- Ok(storage_result) if storage_result == result => {
- if use_new_storage_value {
- return storage_result;
- } else {
- return result;
- }
- },
- Ok(storage_result) => {
- log!(Level::Error, "AconfigTestMission1: error: mismatch for flag 'disabled_rw'. Legacy storage was {result}, new storage was {storage_result}");
- if use_new_storage_value {
- return storage_result;
- } else {
- return result;
- }
- },
- Err(err) => {
- log!(Level::Error, "AconfigTestMission1: error: {err}");
- if use_new_storage_value {
- panic!("failed to read flag value: {err}");
- }
+ match aconfig_storage_result {
+ Ok(storage_result) if storage_result == result => {
+ if use_new_storage_value {
+ return storage_result;
+ } else {
+ return result;
+ }
+ },
+ Ok(storage_result) => {
+ log!(Level::Error, "AconfigTestMission1: error: mismatch for flag 'disabled_rw'. Legacy storage was {result}, new storage was {storage_result}");
+ if use_new_storage_value {
+ return storage_result;
+ } else {
+ return result;
+ }
+ },
+ Err(err) => {
+ log!(Level::Error, "AconfigTestMission1: error: {err}");
+ if use_new_storage_value {
+ panic!("failed to read flag value: {err}");
}
}
}
+ }
- result
- };
-}
+ result
+});
- /// flag value cache for disabled_rw_exported
-lazy_static::lazy_static! {
- static ref CACHED_disabled_rw_exported: bool = {
- let result = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.aconfig_test",
- "com.android.aconfig.test.disabled_rw_exported",
- "false") == "true";
+/// flag value cache for disabled_rw_exported
+static CACHED_disabled_rw_exported: LazyLock<bool> = LazyLock::new(|| {
+ let result = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.aconfig_test",
+ "com.android.aconfig.test.disabled_rw_exported",
+ "false") == "true";
- let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.core_experiments_team_internal",
- "com.android.providers.settings.use_new_storage_value",
- "false") == "true";
+ let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.core_experiments_team_internal",
+ "com.android.providers.settings.use_new_storage_value",
+ "false") == "true";
- if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() {
- // This will be called multiple times. Subsequent calls after the first are noops.
- logger::init(
- logger::Config::default()
- .with_tag_on_device(MIGRATION_LOG_TAG)
- .with_max_level(LevelFilter::Info));
+ if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() {
+ // This will be called multiple times. Subsequent calls after the first are noops.
+ logger::init(
+ logger::Config::default()
+ .with_tag_on_device(MIGRATION_LOG_TAG)
+ .with_max_level(LevelFilter::Info));
- let aconfig_storage_result = FLAG_VAL_MAP
- .as_ref()
- .map_err(|err| format!("failed to get flag val map: {err}"))
- .and_then(|flag_val_map| {
- PACKAGE_OFFSET
- .as_ref()
- .map_err(|err| format!("failed to get package read offset: {err}"))
- .and_then(|package_offset| {
- match package_offset {
- Some(offset) => {
- get_boolean_flag_value(&flag_val_map, offset + 2)
- .map_err(|err| format!("failed to get flag: {err}"))
- },
- None => Err("no context found for package 'com.android.aconfig.test'".to_string())
- }
- })
- });
+ let aconfig_storage_result = FLAG_VAL_MAP
+ .as_ref()
+ .map_err(|err| format!("failed to get flag val map: {err}"))
+ .and_then(|flag_val_map| {
+ PACKAGE_OFFSET
+ .as_ref()
+ .map_err(|err| format!("failed to get package read offset: {err}"))
+ .and_then(|package_offset| {
+ match package_offset {
+ Some(offset) => {
+ get_boolean_flag_value(&flag_val_map, offset + 2)
+ .map_err(|err| format!("failed to get flag: {err}"))
+ },
+ None => Err("no context found for package 'com.android.aconfig.test'".to_string())
+ }
+ })
+ });
- match aconfig_storage_result {
- Ok(storage_result) if storage_result == result => {
- if use_new_storage_value {
- return storage_result;
- } else {
- return result;
- }
- },
- Ok(storage_result) => {
- log!(Level::Error, "AconfigTestMission1: error: mismatch for flag 'disabled_rw_exported'. Legacy storage was {result}, new storage was {storage_result}");
- if use_new_storage_value {
- return storage_result;
- } else {
- return result;
- }
- },
- Err(err) => {
- log!(Level::Error, "AconfigTestMission1: error: {err}");
- if use_new_storage_value {
- panic!("failed to read flag value: {err}");
- }
+ match aconfig_storage_result {
+ Ok(storage_result) if storage_result == result => {
+ if use_new_storage_value {
+ return storage_result;
+ } else {
+ return result;
+ }
+ },
+ Ok(storage_result) => {
+ log!(Level::Error, "AconfigTestMission1: error: mismatch for flag 'disabled_rw_exported'. Legacy storage was {result}, new storage was {storage_result}");
+ if use_new_storage_value {
+ return storage_result;
+ } else {
+ return result;
+ }
+ },
+ Err(err) => {
+ log!(Level::Error, "AconfigTestMission1: error: {err}");
+ if use_new_storage_value {
+ panic!("failed to read flag value: {err}");
}
}
}
+ }
- result
- };
-}
+ result
+});
- /// flag value cache for disabled_rw_in_other_namespace
-lazy_static::lazy_static! {
- static ref CACHED_disabled_rw_in_other_namespace: bool = {
- let result = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.other_namespace",
- "com.android.aconfig.test.disabled_rw_in_other_namespace",
- "false") == "true";
+/// flag value cache for disabled_rw_in_other_namespace
+static CACHED_disabled_rw_in_other_namespace: LazyLock<bool> = LazyLock::new(|| {
+ let result = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.other_namespace",
+ "com.android.aconfig.test.disabled_rw_in_other_namespace",
+ "false") == "true";
- let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.core_experiments_team_internal",
- "com.android.providers.settings.use_new_storage_value",
- "false") == "true";
+ let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.core_experiments_team_internal",
+ "com.android.providers.settings.use_new_storage_value",
+ "false") == "true";
- if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() {
- // This will be called multiple times. Subsequent calls after the first are noops.
- logger::init(
- logger::Config::default()
- .with_tag_on_device(MIGRATION_LOG_TAG)
- .with_max_level(LevelFilter::Info));
+ if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() {
+ // This will be called multiple times. Subsequent calls after the first are noops.
+ logger::init(
+ logger::Config::default()
+ .with_tag_on_device(MIGRATION_LOG_TAG)
+ .with_max_level(LevelFilter::Info));
- let aconfig_storage_result = FLAG_VAL_MAP
- .as_ref()
- .map_err(|err| format!("failed to get flag val map: {err}"))
- .and_then(|flag_val_map| {
- PACKAGE_OFFSET
- .as_ref()
- .map_err(|err| format!("failed to get package read offset: {err}"))
- .and_then(|package_offset| {
- match package_offset {
- Some(offset) => {
- get_boolean_flag_value(&flag_val_map, offset + 3)
- .map_err(|err| format!("failed to get flag: {err}"))
- },
- None => Err("no context found for package 'com.android.aconfig.test'".to_string())
- }
- })
- });
+ let aconfig_storage_result = FLAG_VAL_MAP
+ .as_ref()
+ .map_err(|err| format!("failed to get flag val map: {err}"))
+ .and_then(|flag_val_map| {
+ PACKAGE_OFFSET
+ .as_ref()
+ .map_err(|err| format!("failed to get package read offset: {err}"))
+ .and_then(|package_offset| {
+ match package_offset {
+ Some(offset) => {
+ get_boolean_flag_value(&flag_val_map, offset + 3)
+ .map_err(|err| format!("failed to get flag: {err}"))
+ },
+ None => Err("no context found for package 'com.android.aconfig.test'".to_string())
+ }
+ })
+ });
- match aconfig_storage_result {
- Ok(storage_result) if storage_result == result => {
- if use_new_storage_value {
- return storage_result;
- } else {
- return result;
- }
- },
- Ok(storage_result) => {
- log!(Level::Error, "AconfigTestMission1: error: mismatch for flag 'disabled_rw_in_other_namespace'. Legacy storage was {result}, new storage was {storage_result}");
- if use_new_storage_value {
- return storage_result;
- } else {
- return result;
- }
- },
- Err(err) => {
- log!(Level::Error, "AconfigTestMission1: error: {err}");
- if use_new_storage_value {
- panic!("failed to read flag value: {err}");
- }
+ match aconfig_storage_result {
+ Ok(storage_result) if storage_result == result => {
+ if use_new_storage_value {
+ return storage_result;
+ } else {
+ return result;
+ }
+ },
+ Ok(storage_result) => {
+ log!(Level::Error, "AconfigTestMission1: error: mismatch for flag 'disabled_rw_in_other_namespace'. Legacy storage was {result}, new storage was {storage_result}");
+ if use_new_storage_value {
+ return storage_result;
+ } else {
+ return result;
+ }
+ },
+ Err(err) => {
+ log!(Level::Error, "AconfigTestMission1: error: {err}");
+ if use_new_storage_value {
+ panic!("failed to read flag value: {err}");
}
}
}
+ }
- result
- };
-}
+ result
+});
- /// flag value cache for enabled_rw
-lazy_static::lazy_static! {
- static ref CACHED_enabled_rw: bool = {
- let result = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.aconfig_test",
- "com.android.aconfig.test.enabled_rw",
- "true") == "true";
- let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.core_experiments_team_internal",
- "com.android.providers.settings.use_new_storage_value",
- "false") == "true";
+/// flag value cache for enabled_rw
+static CACHED_enabled_rw: LazyLock<bool> = LazyLock::new(|| {
+ let result = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.aconfig_test",
+ "com.android.aconfig.test.enabled_rw",
+ "true") == "true";
- if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() {
- // This will be called multiple times. Subsequent calls after the first are noops.
- logger::init(
- logger::Config::default()
- .with_tag_on_device(MIGRATION_LOG_TAG)
- .with_max_level(LevelFilter::Info));
+ let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.core_experiments_team_internal",
+ "com.android.providers.settings.use_new_storage_value",
+ "false") == "true";
- let aconfig_storage_result = FLAG_VAL_MAP
- .as_ref()
- .map_err(|err| format!("failed to get flag val map: {err}"))
- .and_then(|flag_val_map| {
- PACKAGE_OFFSET
- .as_ref()
- .map_err(|err| format!("failed to get package read offset: {err}"))
- .and_then(|package_offset| {
- match package_offset {
- Some(offset) => {
- get_boolean_flag_value(&flag_val_map, offset + 8)
- .map_err(|err| format!("failed to get flag: {err}"))
- },
- None => Err("no context found for package 'com.android.aconfig.test'".to_string())
- }
- })
- });
+ if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() {
+ // This will be called multiple times. Subsequent calls after the first are noops.
+ logger::init(
+ logger::Config::default()
+ .with_tag_on_device(MIGRATION_LOG_TAG)
+ .with_max_level(LevelFilter::Info));
- match aconfig_storage_result {
- Ok(storage_result) if storage_result == result => {
- if use_new_storage_value {
- return storage_result;
- } else {
- return result;
- }
- },
- Ok(storage_result) => {
- log!(Level::Error, "AconfigTestMission1: error: mismatch for flag 'enabled_rw'. Legacy storage was {result}, new storage was {storage_result}");
- if use_new_storage_value {
- return storage_result;
- } else {
- return result;
- }
- },
- Err(err) => {
- log!(Level::Error, "AconfigTestMission1: error: {err}");
- if use_new_storage_value {
- panic!("failed to read flag value: {err}");
- }
+ let aconfig_storage_result = FLAG_VAL_MAP
+ .as_ref()
+ .map_err(|err| format!("failed to get flag val map: {err}"))
+ .and_then(|flag_val_map| {
+ PACKAGE_OFFSET
+ .as_ref()
+ .map_err(|err| format!("failed to get package read offset: {err}"))
+ .and_then(|package_offset| {
+ match package_offset {
+ Some(offset) => {
+ get_boolean_flag_value(&flag_val_map, offset + 8)
+ .map_err(|err| format!("failed to get flag: {err}"))
+ },
+ None => Err("no context found for package 'com.android.aconfig.test'".to_string())
+ }
+ })
+ });
+
+ match aconfig_storage_result {
+ Ok(storage_result) if storage_result == result => {
+ if use_new_storage_value {
+ return storage_result;
+ } else {
+ return result;
+ }
+ },
+ Ok(storage_result) => {
+ log!(Level::Error, "AconfigTestMission1: error: mismatch for flag 'enabled_rw'. Legacy storage was {result}, new storage was {storage_result}");
+ if use_new_storage_value {
+ return storage_result;
+ } else {
+ return result;
+ }
+ },
+ Err(err) => {
+ log!(Level::Error, "AconfigTestMission1: error: {err}");
+ if use_new_storage_value {
+ panic!("failed to read flag value: {err}");
}
}
}
+ }
- result
- };
-}
+ result
+});
impl FlagProvider {
@@ -1215,6 +1200,7 @@
use aconfig_storage_read_api::{Mmap, AconfigStorageError, StorageFileType, PackageReadContext, get_mapped_storage_file, get_boolean_flag_value, get_package_read_context};
use std::path::Path;
use std::io::Write;
+use std::sync::LazyLock;
use log::{log, LevelFilter, Level};
static STORAGE_MIGRATION_MARKER_FILE: &str =
@@ -1225,28 +1211,22 @@
pub struct FlagProvider;
/// flag value cache for disabled_rw_exported
-lazy_static::lazy_static! {
- static ref CACHED_disabled_rw_exported: bool = flags_rust::GetServerConfigurableFlag(
+ static CACHED_disabled_rw_exported: LazyLock<bool> = LazyLock::new(|| flags_rust::GetServerConfigurableFlag(
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.disabled_rw_exported",
- "false") == "true";
-}
+ "false") == "true");
/// flag value cache for enabled_fixed_ro_exported
-lazy_static::lazy_static! {
- static ref CACHED_enabled_fixed_ro_exported: bool = flags_rust::GetServerConfigurableFlag(
+ static CACHED_enabled_fixed_ro_exported: LazyLock<bool> = LazyLock::new(|| flags_rust::GetServerConfigurableFlag(
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_fixed_ro_exported",
- "false") == "true";
-}
+ "false") == "true");
/// flag value cache for enabled_ro_exported
-lazy_static::lazy_static! {
- static ref CACHED_enabled_ro_exported: bool = flags_rust::GetServerConfigurableFlag(
+ static CACHED_enabled_ro_exported: LazyLock<bool> = LazyLock::new(|| flags_rust::GetServerConfigurableFlag(
"aconfig_flags.aconfig_test",
"com.android.aconfig.test.enabled_ro_exported",
- "false") == "true";
-}
+ "false") == "true");
impl FlagProvider {
/// query flag disabled_rw_exported
@@ -1292,6 +1272,7 @@
use aconfig_storage_read_api::{Mmap, AconfigStorageError, StorageFileType, PackageReadContext, get_mapped_storage_file, get_boolean_flag_value, get_package_read_context};
use std::path::Path;
use std::io::Write;
+use std::sync::LazyLock;
use log::{log, LevelFilter, Level};
static STORAGE_MIGRATION_MARKER_FILE: &str =
diff --git a/tools/aconfig/aconfig/src/commands.rs b/tools/aconfig/aconfig/src/commands.rs
index 59f0662..1a14f64 100644
--- a/tools/aconfig/aconfig/src/commands.rs
+++ b/tools/aconfig/aconfig/src/commands.rs
@@ -17,7 +17,8 @@
use anyhow::{bail, ensure, Context, Result};
use itertools::Itertools;
use protobuf::Message;
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
+use std::hash::Hasher;
use std::io::Read;
use std::path::PathBuf;
@@ -31,6 +32,7 @@
ParsedFlagExt, ProtoFlagMetadata, ProtoFlagPermission, ProtoFlagState, ProtoParsedFlag,
ProtoParsedFlags, ProtoTracepoint,
};
+use aconfig_storage_file::sip_hasher13::SipHasher13;
use aconfig_storage_file::StorageFileType;
pub struct Input {
@@ -410,12 +412,43 @@
Ok(flag_ids)
}
+#[allow(dead_code)] // TODO: b/316357686 - Use fingerprint in codegen to
+ // protect hardcoded offset reads.
+pub fn compute_flag_offsets_fingerprint(flags_map: &HashMap<String, u16>) -> Result<u64> {
+ let mut hasher = SipHasher13::new();
+
+ // Need to sort to ensure the data is added to the hasher in the same order
+ // each run.
+ let sorted_map: BTreeMap<&String, &u16> = flags_map.iter().collect();
+
+ for (flag, offset) in sorted_map {
+ // See https://docs.rs/siphasher/latest/siphasher/#note for use of write
+ // over write_i16. Similarly, use to_be_bytes rather than to_ne_bytes to
+ // ensure consistency.
+ hasher.write(flag.as_bytes());
+ hasher.write(&offset.to_be_bytes());
+ }
+ Ok(hasher.finish())
+}
+
#[cfg(test)]
mod tests {
use super::*;
use aconfig_protos::ProtoFlagPurpose;
#[test]
+ fn test_offset_fingerprint() {
+ let parsed_flags = crate::test::parse_test_flags();
+ let package = find_unique_package(&parsed_flags.parsed_flag).unwrap().to_string();
+ let flag_ids = assign_flag_ids(&package, parsed_flags.parsed_flag.iter()).unwrap();
+ let expected_fingerprint = 10709892481002252132u64;
+
+ let hash_result = compute_flag_offsets_fingerprint(&flag_ids);
+
+ assert_eq!(hash_result.unwrap(), expected_fingerprint);
+ }
+
+ #[test]
fn test_parse_flags() {
let parsed_flags = crate::test::parse_test_flags(); // calls parse_flags
aconfig_protos::parsed_flags::verify_fields(&parsed_flags).unwrap();
diff --git a/tools/aconfig/aconfig/templates/rust.template b/tools/aconfig/aconfig/templates/rust.template
index e7287d2..ea1c600 100644
--- a/tools/aconfig/aconfig/templates/rust.template
+++ b/tools/aconfig/aconfig/templates/rust.template
@@ -2,6 +2,7 @@
use aconfig_storage_read_api::\{Mmap, AconfigStorageError, StorageFileType, PackageReadContext, get_mapped_storage_file, get_boolean_flag_value, get_package_read_context};
use std::path::Path;
use std::io::Write;
+use std::sync::LazyLock;
use log::\{log, LevelFilter, Level};
static STORAGE_MIGRATION_MARKER_FILE: &str =
@@ -13,95 +14,89 @@
{{ if has_readwrite- }}
{{ if allow_instrumentation }}
-lazy_static::lazy_static! \{
- static ref PACKAGE_OFFSET: Result<Option<u32>, AconfigStorageError> = unsafe \{
- get_mapped_storage_file("{container}", StorageFileType::PackageMap)
- .and_then(|package_map| get_package_read_context(&package_map, "{package}"))
- .map(|context| context.map(|c| c.boolean_start_index))
- };
+static PACKAGE_OFFSET: LazyLock<Result<Option<u32>, AconfigStorageError>> = LazyLock::new(|| unsafe \{
+ get_mapped_storage_file("{container}", StorageFileType::PackageMap)
+ .and_then(|package_map| get_package_read_context(&package_map, "{package}"))
+ .map(|context| context.map(|c| c.boolean_start_index))
+});
- static ref FLAG_VAL_MAP: Result<Mmap, AconfigStorageError> = unsafe \{
- get_mapped_storage_file("{container}", StorageFileType::FlagVal)
- };
-}
+static FLAG_VAL_MAP: LazyLock<Result<Mmap, AconfigStorageError>> = LazyLock::new(|| unsafe \{
+ get_mapped_storage_file("{container}", StorageFileType::FlagVal)
+});
{{ -endif }}
{{ -for flag in template_flags }}
{{ -if flag.readwrite }}
/// flag value cache for {flag.name}
{{ if allow_instrumentation }}
-lazy_static::lazy_static! \{
- static ref CACHED_{flag.name}: bool = \{
- let result = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.{flag.device_config_namespace}",
- "{flag.device_config_flag}",
- "{flag.default_value}") == "true";
-
- let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
- "aconfig_flags.core_experiments_team_internal",
- "com.android.providers.settings.use_new_storage_value",
- "false") == "true";
-
- if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() \{
- // This will be called multiple times. Subsequent calls after the first are noops.
- logger::init(
- logger::Config::default()
- .with_tag_on_device(MIGRATION_LOG_TAG)
- .with_max_level(LevelFilter::Info));
-
- let aconfig_storage_result = FLAG_VAL_MAP
- .as_ref()
- .map_err(|err| format!("failed to get flag val map: \{err}"))
- .and_then(|flag_val_map| \{
- PACKAGE_OFFSET
- .as_ref()
- .map_err(|err| format!("failed to get package read offset: \{err}"))
- .and_then(|package_offset| \{
- match package_offset \{
- Some(offset) => \{
- get_boolean_flag_value(&flag_val_map, offset + {flag.flag_offset})
- .map_err(|err| format!("failed to get flag: \{err}"))
- },
- None => Err("no context found for package '{package}'".to_string())
- }
- })
- });
-
- match aconfig_storage_result \{
- Ok(storage_result) if storage_result == result => \{
- if use_new_storage_value \{
- return storage_result;
- } else \{
- return result;
- }
- },
- Ok(storage_result) => \{
- log!(Level::Error, "AconfigTestMission1: error: mismatch for flag '{flag.name}'. Legacy storage was \{result}, new storage was \{storage_result}");
- if use_new_storage_value \{
- return storage_result;
- } else \{
- return result;
- }
- },
- Err(err) => \{
- log!(Level::Error, "AconfigTestMission1: error: \{err}");
- if use_new_storage_value \{
- panic!("failed to read flag value: \{err}");
- }
- }
- }
- }
-
- result
- };
-}
-{{ else }}
-lazy_static::lazy_static! \{
- static ref CACHED_{flag.name}: bool = flags_rust::GetServerConfigurableFlag(
+static CACHED_{flag.name}: LazyLock<bool> = LazyLock::new(|| \{
+ let result = flags_rust::GetServerConfigurableFlag(
"aconfig_flags.{flag.device_config_namespace}",
"{flag.device_config_flag}",
"{flag.default_value}") == "true";
-}
+
+ let use_new_storage_value = flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.core_experiments_team_internal",
+ "com.android.providers.settings.use_new_storage_value",
+ "false") == "true";
+
+ if Path::new(STORAGE_MIGRATION_MARKER_FILE).exists() \{
+ // This will be called multiple times. Subsequent calls after the first are noops.
+ logger::init(
+ logger::Config::default()
+ .with_tag_on_device(MIGRATION_LOG_TAG)
+ .with_max_level(LevelFilter::Info));
+
+ let aconfig_storage_result = FLAG_VAL_MAP
+ .as_ref()
+ .map_err(|err| format!("failed to get flag val map: \{err}"))
+ .and_then(|flag_val_map| \{
+ PACKAGE_OFFSET
+ .as_ref()
+ .map_err(|err| format!("failed to get package read offset: \{err}"))
+ .and_then(|package_offset| \{
+ match package_offset \{
+ Some(offset) => \{
+ get_boolean_flag_value(&flag_val_map, offset + {flag.flag_offset})
+ .map_err(|err| format!("failed to get flag: \{err}"))
+ },
+ None => Err("no context found for package '{package}'".to_string())
+ }
+ })
+ });
+
+ match aconfig_storage_result \{
+ Ok(storage_result) if storage_result == result => \{
+ if use_new_storage_value \{
+ return storage_result;
+ } else \{
+ return result;
+ }
+ },
+ Ok(storage_result) => \{
+ log!(Level::Error, "AconfigTestMission1: error: mismatch for flag '{flag.name}'. Legacy storage was \{result}, new storage was \{storage_result}");
+ if use_new_storage_value \{
+ return storage_result;
+ } else \{
+ return result;
+ }
+ },
+ Err(err) => \{
+ log!(Level::Error, "AconfigTestMission1: error: \{err}");
+ if use_new_storage_value \{
+ panic!("failed to read flag value: \{err}");
+ }
+ }
+ }
+ }
+
+ result
+ });
+{{ else }}
+static CACHED_{flag.name}: LazyLock<bool> = LazyLock::new(|| flags_rust::GetServerConfigurableFlag(
+ "aconfig_flags.{flag.device_config_namespace}",
+ "{flag.device_config_flag}",
+ "{flag.default_value}") == "true");
{{ endif }}
{{ -endif }}
{{ -endfor }}
diff --git a/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/FlagTable.java b/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/FlagTable.java
index e85fdee..9838a7c 100644
--- a/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/FlagTable.java
+++ b/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/FlagTable.java
@@ -16,41 +16,50 @@
package android.aconfig.storage;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Objects;
public class FlagTable {
private Header mHeader;
- private Map<String, Node> mNodeMap;
+ private ByteBufferReader mReader;
public static FlagTable fromBytes(ByteBuffer bytes) {
FlagTable flagTable = new FlagTable();
- ByteBufferReader reader = new ByteBufferReader(bytes);
- Header header = Header.fromBytes(reader);
- flagTable.mHeader = header;
- flagTable.mNodeMap = new HashMap(TableUtils.getTableSize(header.mNumFlags));
- reader.position(header.mNodeOffset);
- for (int i = 0; i < header.mNumFlags; i++) {
- Node node = Node.fromBytes(reader);
- flagTable.mNodeMap.put(makeKey(node.mPackageId, node.mFlagName), node);
- }
+ flagTable.mReader = new ByteBufferReader(bytes);
+ flagTable.mHeader = Header.fromBytes(flagTable.mReader);
+
return flagTable;
}
public Node get(int packageId, String flagName) {
- return mNodeMap.get(makeKey(packageId, flagName));
+ int numBuckets = (mHeader.mNodeOffset - mHeader.mBucketOffset) / 4;
+ int bucketIndex = TableUtils.getBucketIndex(makeKey(packageId, flagName), numBuckets);
+
+ mReader.position(mHeader.mBucketOffset + bucketIndex * 4);
+ int nodeIndex = mReader.readInt();
+
+ while (nodeIndex != -1) {
+ mReader.position(nodeIndex);
+ Node node = Node.fromBytes(mReader);
+ if (Objects.equals(flagName, node.mFlagName) && packageId == node.mPackageId) {
+ return node;
+ }
+ nodeIndex = node.mNextOffset;
+ }
+
+ throw new AconfigStorageException("get cannot find flag: " + flagName);
}
public Header getHeader() {
return mHeader;
}
- private static String makeKey(int packageId, String flagName) {
+ private static byte[] makeKey(int packageId, String flagName) {
StringBuilder ret = new StringBuilder();
- return ret.append(packageId).append('/').append(flagName).toString();
+ return ret.append(packageId).append('/').append(flagName).toString().getBytes(UTF_8);
}
public static class Header {
diff --git a/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/PackageTable.java b/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/PackageTable.java
index 7ef947d..773b882 100644
--- a/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/PackageTable.java
+++ b/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/PackageTable.java
@@ -16,6 +16,8 @@
package android.aconfig.storage;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.nio.ByteBuffer;
import java.util.Objects;
@@ -33,13 +35,22 @@
}
public Node get(String packageName) {
- mReader.position(mHeader.mNodeOffset);
- for (int i = 0; i < mHeader.mNumPackages; i++) {
+
+ int numBuckets = (mHeader.mNodeOffset - mHeader.mBucketOffset) / 4;
+ int bucketIndex = TableUtils.getBucketIndex(packageName.getBytes(UTF_8), numBuckets);
+
+ mReader.position(mHeader.mBucketOffset + bucketIndex * 4);
+ int nodeIndex = mReader.readInt();
+
+ while (nodeIndex != -1) {
+ mReader.position(nodeIndex);
Node node = Node.fromBytes(mReader);
- if (Objects.equals(node.mPackageName, packageName)) {
+ if (Objects.equals(packageName, node.mPackageName)) {
return node;
}
+ nodeIndex = node.mNextOffset;
}
+
throw new AconfigStorageException("get cannot find package: " + packageName);
}
diff --git a/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/SipHasher13.java b/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/SipHasher13.java
index 8faee58..64714ee 100644
--- a/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/SipHasher13.java
+++ b/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/SipHasher13.java
@@ -44,43 +44,39 @@
private void cRounds() {
v0 += v1;
- v1 = rotateLeft(v1, 13);
+ v1 = Long.rotateLeft(v1, 13);
v1 ^= v0;
- v0 = rotateLeft(v0, 32);
+ v0 = Long.rotateLeft(v0, 32);
v2 += v3;
- v3 = rotateLeft(v3, 16);
+ v3 = Long.rotateLeft(v3, 16);
v3 ^= v2;
v0 += v3;
- v3 = rotateLeft(v3, 21);
+ v3 = Long.rotateLeft(v3, 21);
v3 ^= v0;
v2 += v1;
- v1 = rotateLeft(v1, 17);
+ v1 = Long.rotateLeft(v1, 17);
v1 ^= v2;
- v2 = rotateLeft(v2, 32);
+ v2 = Long.rotateLeft(v2, 32);
}
private void dRounds() {
for (int i = 0; i < 3; i++) {
v0 += v1;
- v1 = rotateLeft(v1, 13);
+ v1 = Long.rotateLeft(v1, 13);
v1 ^= v0;
- v0 = rotateLeft(v0, 32);
+ v0 = Long.rotateLeft(v0, 32);
v2 += v3;
- v3 = rotateLeft(v3, 16);
+ v3 = Long.rotateLeft(v3, 16);
v3 ^= v2;
v0 += v3;
- v3 = rotateLeft(v3, 21);
+ v3 = Long.rotateLeft(v3, 21);
v3 ^= v0;
v2 += v1;
- v1 = rotateLeft(v1, 17);
+ v1 = Long.rotateLeft(v1, 17);
v1 ^= v2;
- v2 = rotateLeft(v2, 32);
+ v2 = Long.rotateLeft(v2, 32);
}
}
-
- private static long rotateLeft(long value, int shift) {
- return (value << shift) | value >>> (64 - shift);
- }
}
public static long hash(byte[] data) {
diff --git a/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/TableUtils.java b/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/TableUtils.java
index 714b53b..81168f5 100644
--- a/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/TableUtils.java
+++ b/tools/aconfig/aconfig_storage_file/srcs/android/aconfig/storage/TableUtils.java
@@ -58,4 +58,9 @@
}
throw new AconfigStorageException("Number of items in a hash table exceeds limit");
}
+
+ public static int getBucketIndex(byte[] val, int numBuckets) {
+ long hashVal = SipHasher13.hash(val);
+ return (int) Long.remainderUnsigned(hashVal, numBuckets);
+ }
}
diff --git a/tools/aconfig/aconfig_storage_file/tests/Android.bp b/tools/aconfig/aconfig_storage_file/tests/Android.bp
index e2e225d..12e4aca 100644
--- a/tools/aconfig/aconfig_storage_file/tests/Android.bp
+++ b/tools/aconfig/aconfig_storage_file/tests/Android.bp
@@ -30,9 +30,10 @@
static_libs: [
"androidx.test.runner",
"junit",
+ "aconfig_storage_file_java",
],
test_config: "AndroidStorageJaveTest.xml",
- certificate: "platform",
+ sdk_version: "test_current",
data: [
"package.map",
"flag.map",
@@ -42,4 +43,5 @@
test_suites: [
"general-tests",
],
+ jarjar_rules: "jarjar.txt",
}
diff --git a/tools/aconfig/aconfig_storage_file/tests/jarjar.txt b/tools/aconfig/aconfig_storage_file/tests/jarjar.txt
new file mode 100644
index 0000000..a6c17fa
--- /dev/null
+++ b/tools/aconfig/aconfig_storage_file/tests/jarjar.txt
@@ -0,0 +1,15 @@
+rule android.aconfig.storage.AconfigStorageException android.aconfig.storage.test.AconfigStorageException
+rule android.aconfig.storage.FlagTable android.aconfig.storage.test.FlagTable
+rule android.aconfig.storage.PackageTable android.aconfig.storage.test.PackageTable
+rule android.aconfig.storage.ByteBufferReader android.aconfig.storage.test.ByteBufferReader
+rule android.aconfig.storage.FlagType android.aconfig.storage.test.FlagType
+rule android.aconfig.storage.SipHasher13 android.aconfig.storage.test.SipHasher13
+rule android.aconfig.storage.FileType android.aconfig.storage.test.FileType
+rule android.aconfig.storage.FlagValueList android.aconfig.storage.test.FlagValueList
+rule android.aconfig.storage.TableUtils android.aconfig.storage.test.TableUtils
+
+
+rule android.aconfig.storage.FlagTable$* android.aconfig.storage.test.FlagTable$@1
+rule android.aconfig.storage.PackageTable$* android.aconfig.storage.test.PackageTable$@1
+rule android.aconfig.storage.FlagValueList$* android.aconfig.storage.test.FlagValueList@1
+rule android.aconfig.storage.SipHasher13$* android.aconfig.storage.test.SipHasher13@1
diff --git a/tools/aconfig/aconfig_storage_read_api/Android.bp b/tools/aconfig/aconfig_storage_read_api/Android.bp
index 9e950a6..f96b223 100644
--- a/tools/aconfig/aconfig_storage_read_api/Android.bp
+++ b/tools/aconfig/aconfig_storage_read_api/Android.bp
@@ -147,6 +147,7 @@
crate_name: "aconfig_storage_read_api_rust_jni",
srcs: ["srcs/lib.rs"],
rustlibs: [
+ "libaconfig_storage_file",
"libaconfig_storage_read_api",
"libanyhow",
"libjni",
diff --git a/tools/aconfig/aconfig_storage_read_api/srcs/android/aconfig/storage/AconfigStorageReadAPI.java b/tools/aconfig/aconfig_storage_read_api/srcs/android/aconfig/storage/AconfigStorageReadAPI.java
index 406ff24..850c2b8 100644
--- a/tools/aconfig/aconfig_storage_read_api/srcs/android/aconfig/storage/AconfigStorageReadAPI.java
+++ b/tools/aconfig/aconfig_storage_read_api/srcs/android/aconfig/storage/AconfigStorageReadAPI.java
@@ -16,18 +16,14 @@
package android.aconfig.storage;
+import dalvik.annotation.optimization.FastNative;
+
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
-import java.nio.channels.FileChannel.MapMode;
-
-import android.aconfig.storage.PackageReadContext;
-import android.aconfig.storage.FlagReadContext;
-
-import dalvik.annotation.optimization.FastNative;
public class AconfigStorageReadAPI {
@@ -50,9 +46,8 @@
}
// Map a storage file given container and file type
- public static MappedByteBuffer getMappedFile(
- String container,
- StorageFileType type) throws IOException{
+ public static MappedByteBuffer getMappedFile(String container, StorageFileType type)
+ throws IOException {
switch (type) {
case PACKAGE_MAP:
return mapStorageFile(STORAGEDIR + "/maps/" + container + ".package.map");
@@ -73,14 +68,14 @@
// @throws IOException if the passed in file is not a valid package map file
@FastNative
private static native ByteBuffer getPackageReadContextImpl(
- ByteBuffer mappedFile, String packageName) throws IOException;
+ ByteBuffer mappedFile, String packageName) throws IOException;
// API to get package read context
// @param mappedFile: memory mapped package map file
// @param packageName: package name
// @throws IOException if the passed in file is not a valid package map file
- static public PackageReadContext getPackageReadContext (
- ByteBuffer mappedFile, String packageName) throws IOException {
+ public static PackageReadContext getPackageReadContext(
+ ByteBuffer mappedFile, String packageName) throws IOException {
ByteBuffer buffer = getPackageReadContextImpl(mappedFile, packageName);
buffer.order(ByteOrder.LITTLE_ENDIAN);
return new PackageReadContext(buffer.getInt(), buffer.getInt(4));
@@ -94,7 +89,7 @@
// @throws IOException if the passed in file is not a valid flag map file
@FastNative
private static native ByteBuffer getFlagReadContextImpl(
- ByteBuffer mappedFile, int packageId, String flagName) throws IOException;
+ ByteBuffer mappedFile, int packageId, String flagName) throws IOException;
// API to get flag read context
// @param mappedFile: memory mapped flag map file
@@ -103,7 +98,7 @@
// @param flagName: flag name
// @throws IOException if the passed in file is not a valid flag map file
public static FlagReadContext getFlagReadContext(
- ByteBuffer mappedFile, int packageId, String flagName) throws IOException {
+ ByteBuffer mappedFile, int packageId, String flagName) throws IOException {
ByteBuffer buffer = getFlagReadContextImpl(mappedFile, packageId, flagName);
buffer.order(ByteOrder.LITTLE_ENDIAN);
return new FlagReadContext(buffer.getInt(), buffer.getInt(4));
@@ -115,8 +110,11 @@
// @throws IOException if the passed in file is not a valid flag value file or the
// flag index went over the file boundary.
@FastNative
- public static native boolean getBooleanFlagValue(
- ByteBuffer mappedFile, int flagIndex) throws IOException;
+ public static native boolean getBooleanFlagValue(ByteBuffer mappedFile, int flagIndex)
+ throws IOException;
+
+ @FastNative
+ public static native long hash(String packageName) throws IOException;
static {
System.loadLibrary("aconfig_storage_read_api_rust_jni");
diff --git a/tools/aconfig/aconfig_storage_read_api/srcs/lib.rs b/tools/aconfig/aconfig_storage_read_api/srcs/lib.rs
index 304a059..f5f12bb 100644
--- a/tools/aconfig/aconfig_storage_read_api/srcs/lib.rs
+++ b/tools/aconfig/aconfig_storage_read_api/srcs/lib.rs
@@ -1,5 +1,6 @@
//! aconfig storage read api java rust interlop
+use aconfig_storage_file::SipHasher13;
use aconfig_storage_read_api::flag_table_query::find_flag_read_context;
use aconfig_storage_read_api::flag_value_query::find_boolean_flag_value;
use aconfig_storage_read_api::package_table_query::find_package_read_context;
@@ -7,8 +8,9 @@
use anyhow::Result;
use jni::objects::{JByteBuffer, JClass, JString};
-use jni::sys::{jboolean, jint};
+use jni::sys::{jboolean, jint, jlong};
use jni::JNIEnv;
+use std::hash::Hasher;
/// Call rust find package read context
fn get_package_read_context_java(
@@ -158,3 +160,30 @@
}
}
}
+
+/// Get flag value JNI
+#[no_mangle]
+#[allow(unused)]
+pub extern "system" fn Java_android_aconfig_storage_AconfigStorageReadAPI_hash<'local>(
+ mut env: JNIEnv<'local>,
+ class: JClass<'local>,
+ package_name: JString<'local>,
+) -> jlong {
+ match siphasher13_hash(&mut env, package_name) {
+ Ok(value) => value as jlong,
+ Err(errmsg) => {
+ env.throw(("java/io/IOException", errmsg.to_string())).expect("failed to throw");
+ 0i64
+ }
+ }
+}
+
+fn siphasher13_hash(env: &mut JNIEnv, package_name: JString) -> Result<u64> {
+ // SAFETY:
+ // The safety here is ensured as the flag name is guaranteed to be a java string
+ let flag_name: String = unsafe { env.get_string_unchecked(&package_name)?.into() };
+ let mut s = SipHasher13::new();
+ s.write(flag_name.as_bytes());
+ s.write_u8(0xff);
+ Ok(s.finish())
+}
diff --git a/tools/aconfig/aconfig_storage_read_api/tests/java/AconfigStorageReadAPITest.java b/tools/aconfig/aconfig_storage_read_api/tests/java/AconfigStorageReadAPITest.java
index a26b257..191741e 100644
--- a/tools/aconfig/aconfig_storage_read_api/tests/java/AconfigStorageReadAPITest.java
+++ b/tools/aconfig/aconfig_storage_read_api/tests/java/AconfigStorageReadAPITest.java
@@ -16,28 +16,29 @@
package android.aconfig.storage.test;
-import java.io.IOException;
-import java.nio.MappedByteBuffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+
+import android.aconfig.DeviceProtos;
+import android.aconfig.nano.Aconfig.parsed_flag;
+import android.aconfig.storage.AconfigStorageReadAPI;
+import android.aconfig.storage.FlagReadContext;
+import android.aconfig.storage.FlagReadContext.StoredFlagType;
+import android.aconfig.storage.PackageReadContext;
+import android.aconfig.storage.SipHasher13;
+import android.aconfig.storage.StorageInternalReader;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import android.aconfig.storage.AconfigStorageReadAPI;
-import android.aconfig.storage.PackageReadContext;
-import android.aconfig.storage.FlagReadContext;
-import android.aconfig.storage.FlagReadContext.StoredFlagType;
+import java.io.IOException;
+import java.nio.MappedByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
@RunWith(JUnit4.class)
-public class AconfigStorageReadAPITest{
+public class AconfigStorageReadAPITest {
private String mStorageDir = "/data/local/tmp/aconfig_java_api_test";
@@ -45,26 +46,29 @@
public void testPackageContextQuery() {
MappedByteBuffer packageMap = null;
try {
- packageMap = AconfigStorageReadAPI.mapStorageFile(
- mStorageDir + "/maps/mockup.package.map");
- } catch(IOException ex){
+ packageMap =
+ AconfigStorageReadAPI.mapStorageFile(mStorageDir + "/maps/mockup.package.map");
+ } catch (IOException ex) {
assertTrue(ex.toString(), false);
}
assertTrue(packageMap != null);
try {
- PackageReadContext context = AconfigStorageReadAPI.getPackageReadContext(
- packageMap, "com.android.aconfig.storage.test_1");
+ PackageReadContext context =
+ AconfigStorageReadAPI.getPackageReadContext(
+ packageMap, "com.android.aconfig.storage.test_1");
assertEquals(context.mPackageId, 0);
assertEquals(context.mBooleanStartIndex, 0);
- context = AconfigStorageReadAPI.getPackageReadContext(
- packageMap, "com.android.aconfig.storage.test_2");
+ context =
+ AconfigStorageReadAPI.getPackageReadContext(
+ packageMap, "com.android.aconfig.storage.test_2");
assertEquals(context.mPackageId, 1);
assertEquals(context.mBooleanStartIndex, 3);
- context = AconfigStorageReadAPI.getPackageReadContext(
- packageMap, "com.android.aconfig.storage.test_4");
+ context =
+ AconfigStorageReadAPI.getPackageReadContext(
+ packageMap, "com.android.aconfig.storage.test_4");
assertEquals(context.mPackageId, 2);
assertEquals(context.mBooleanStartIndex, 6);
} catch (IOException ex) {
@@ -76,19 +80,19 @@
public void testNonExistPackageContextQuery() {
MappedByteBuffer packageMap = null;
try {
- packageMap = AconfigStorageReadAPI.mapStorageFile(
- mStorageDir + "/maps/mockup.package.map");
- } catch(IOException ex){
+ packageMap =
+ AconfigStorageReadAPI.mapStorageFile(mStorageDir + "/maps/mockup.package.map");
+ } catch (IOException ex) {
assertTrue(ex.toString(), false);
}
assertTrue(packageMap != null);
try {
- PackageReadContext context = AconfigStorageReadAPI.getPackageReadContext(
- packageMap, "unknown");
+ PackageReadContext context =
+ AconfigStorageReadAPI.getPackageReadContext(packageMap, "unknown");
assertEquals(context.mPackageId, -1);
assertEquals(context.mBooleanStartIndex, -1);
- } catch(IOException ex){
+ } catch (IOException ex) {
assertTrue(ex.toString(), false);
}
}
@@ -97,12 +101,11 @@
public void testFlagContextQuery() {
MappedByteBuffer flagMap = null;
try {
- flagMap = AconfigStorageReadAPI.mapStorageFile(
- mStorageDir + "/maps/mockup.flag.map");
- } catch(IOException ex){
+ flagMap = AconfigStorageReadAPI.mapStorageFile(mStorageDir + "/maps/mockup.flag.map");
+ } catch (IOException ex) {
assertTrue(ex.toString(), false);
}
- assertTrue(flagMap!= null);
+ assertTrue(flagMap != null);
class Baseline {
public int mPackageId;
@@ -110,10 +113,8 @@
public StoredFlagType mFlagType;
public int mFlagIndex;
- public Baseline(int packageId,
- String flagName,
- StoredFlagType flagType,
- int flagIndex) {
+ public Baseline(
+ int packageId, String flagName, StoredFlagType flagType, int flagIndex) {
mPackageId = packageId;
mFlagName = flagName;
mFlagType = flagType;
@@ -133,8 +134,9 @@
try {
for (Baseline baseline : baselines) {
- FlagReadContext context = AconfigStorageReadAPI.getFlagReadContext(
- flagMap, baseline.mPackageId, baseline.mFlagName);
+ FlagReadContext context =
+ AconfigStorageReadAPI.getFlagReadContext(
+ flagMap, baseline.mPackageId, baseline.mFlagName);
assertEquals(context.mFlagType, baseline.mFlagType);
assertEquals(context.mFlagIndex, baseline.mFlagIndex);
}
@@ -147,21 +149,19 @@
public void testNonExistFlagContextQuery() {
MappedByteBuffer flagMap = null;
try {
- flagMap = AconfigStorageReadAPI.mapStorageFile(
- mStorageDir + "/maps/mockup.flag.map");
- } catch(IOException ex){
+ flagMap = AconfigStorageReadAPI.mapStorageFile(mStorageDir + "/maps/mockup.flag.map");
+ } catch (IOException ex) {
assertTrue(ex.toString(), false);
}
- assertTrue(flagMap!= null);
+ assertTrue(flagMap != null);
try {
- FlagReadContext context = AconfigStorageReadAPI.getFlagReadContext(
- flagMap, 0, "unknown");
+ FlagReadContext context =
+ AconfigStorageReadAPI.getFlagReadContext(flagMap, 0, "unknown");
assertEquals(context.mFlagType, null);
assertEquals(context.mFlagIndex, -1);
- context = AconfigStorageReadAPI.getFlagReadContext(
- flagMap, 3, "enabled_ro");
+ context = AconfigStorageReadAPI.getFlagReadContext(flagMap, 3, "enabled_ro");
assertEquals(context.mFlagType, null);
assertEquals(context.mFlagIndex, -1);
} catch (IOException ex) {
@@ -173,12 +173,11 @@
public void testBooleanFlagValueQuery() {
MappedByteBuffer flagVal = null;
try {
- flagVal = AconfigStorageReadAPI.mapStorageFile(
- mStorageDir + "/boot/mockup.val");
+ flagVal = AconfigStorageReadAPI.mapStorageFile(mStorageDir + "/boot/mockup.val");
} catch (IOException ex) {
assertTrue(ex.toString(), false);
}
- assertTrue(flagVal!= null);
+ assertTrue(flagVal != null);
boolean[] baselines = {false, true, true, false, true, true, true, true};
for (int i = 0; i < 8; ++i) {
@@ -195,12 +194,11 @@
public void testInvalidBooleanFlagValueQuery() {
MappedByteBuffer flagVal = null;
try {
- flagVal = AconfigStorageReadAPI.mapStorageFile(
- mStorageDir + "/boot/mockup.val");
+ flagVal = AconfigStorageReadAPI.mapStorageFile(mStorageDir + "/boot/mockup.val");
} catch (IOException ex) {
assertTrue(ex.toString(), false);
}
- assertTrue(flagVal!= null);
+ assertTrue(flagVal != null);
try {
Boolean value = AconfigStorageReadAPI.getBooleanFlagValue(flagVal, 9);
@@ -210,4 +208,63 @@
assertTrue(ex.toString(), ex.toString().contains(expectedErrmsg));
}
}
- }
+
+ @Test
+ public void testRustJavaEqualHash() throws IOException {
+ List<parsed_flag> flags = DeviceProtos.loadAndParseFlagProtos();
+ for (parsed_flag flag : flags) {
+ String packageName = flag.package_;
+ String flagName = flag.name;
+ long rHash = AconfigStorageReadAPI.hash(packageName);
+ long jHash = SipHasher13.hash(packageName.getBytes());
+ assertEquals(rHash, jHash);
+
+ String fullFlagName = packageName + "/" + flagName;
+ rHash = AconfigStorageReadAPI.hash(fullFlagName);
+ jHash = SipHasher13.hash(fullFlagName.getBytes());
+ assertEquals(rHash, jHash);
+ }
+ }
+
+ @Test
+ public void testRustJavaEqualFlag() throws IOException {
+ List<parsed_flag> flags = DeviceProtos.loadAndParseFlagProtos();
+
+ String mapPath = "/metadata/aconfig/maps/";
+ String flagsPath = "/metadata/aconfig/boot/";
+
+ for (parsed_flag flag : flags) {
+
+ String container = flag.container;
+ String packageName = flag.package_;
+ String flagName = flag.name;
+ String fullFlagName = packageName + "/" + flagName;
+
+ MappedByteBuffer packageMap =
+ AconfigStorageReadAPI.mapStorageFile(mapPath + container + ".package.map");
+ MappedByteBuffer flagMap =
+ AconfigStorageReadAPI.mapStorageFile(mapPath + container + ".flag.map");
+ MappedByteBuffer flagValList =
+ AconfigStorageReadAPI.mapStorageFile(flagsPath + container + ".val");
+
+ PackageReadContext packageContext =
+ AconfigStorageReadAPI.getPackageReadContext(packageMap, packageName);
+
+ FlagReadContext flagContext =
+ AconfigStorageReadAPI.getFlagReadContext(
+ flagMap, packageContext.mPackageId, flagName);
+
+ boolean rVal =
+ AconfigStorageReadAPI.getBooleanFlagValue(
+ flagValList,
+ packageContext.mBooleanStartIndex + flagContext.mFlagIndex);
+
+ StorageInternalReader reader = new StorageInternalReader(container, packageName);
+ boolean jVal = reader.getBooleanFlagValue(flagContext.mFlagIndex);
+
+ long rHash = AconfigStorageReadAPI.hash(packageName);
+ long jHash = SipHasher13.hash(packageName.getBytes());
+ assertEquals(rVal, jVal);
+ }
+ }
+}
diff --git a/tools/aconfig/aconfig_storage_read_api/tests/java/Android.bp b/tools/aconfig/aconfig_storage_read_api/tests/java/Android.bp
index 11b3824..3d4e9ad 100644
--- a/tools/aconfig/aconfig_storage_read_api/tests/java/Android.bp
+++ b/tools/aconfig/aconfig_storage_read_api/tests/java/Android.bp
@@ -2,6 +2,8 @@
name: "aconfig_storage_read_api.test.java",
srcs: ["./**/*.java"],
static_libs: [
+ "aconfig_device_paths_java",
+ "aconfig_storage_file_java",
"aconfig_storage_reader_java",
"androidx.test.rules",
"libaconfig_storage_read_api_java",
diff --git a/tools/aconfig/aflags/src/aconfig_storage_source.rs b/tools/aconfig/aflags/src/aconfig_storage_source.rs
index a2c6012..b2fd3c9 100644
--- a/tools/aconfig/aflags/src/aconfig_storage_source.rs
+++ b/tools/aconfig/aflags/src/aconfig_storage_source.rs
@@ -62,7 +62,7 @@
permission,
value_picked_from,
staged_value,
- container: msg.container.ok_or(anyhow!("missing container"))?,
+ container: "-".to_string(),
// TODO: remove once DeviceConfig is not in the CLI.
namespace: "-".to_string(),
diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp
index cf7e2ae..806e192 100644
--- a/tools/releasetools/Android.bp
+++ b/tools/releasetools/Android.bp
@@ -555,6 +555,7 @@
"releasetools_common",
"ota_metadata_proto",
"ota_utils_lib",
+ "update_payload",
],
}
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index b485440..8e89c87 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -190,10 +190,10 @@
import add_img_to_target_files
import ota_from_raw_img
-import ota_utils
import apex_utils
import common
import payload_signer
+import update_payload
from payload_signer import SignOtaPackage, PAYLOAD_BIN
@@ -223,6 +223,7 @@
OPTIONS.allow_gsi_debug_sepolicy = False
OPTIONS.override_apk_keys = None
OPTIONS.override_apex_keys = None
+OPTIONS.input_tmp = None
AVB_FOOTER_ARGS_BY_PARTITION = {
@@ -583,16 +584,13 @@
def RegenerateKernelPartitions(input_tf_zip: zipfile.ZipFile, output_tf_zip: zipfile.ZipFile, misc_info):
"""Re-generate boot and dtbo partitions using new signing configuration"""
+ files_to_unzip = [
+ "PREBUILT_IMAGES/*", "BOOTABLE_IMAGES/*.img", "*/boot_16k.img", "*/dtbo_16k.img"]
if OPTIONS.input_tmp is None:
- OPTIONS.input_tmp = common.UnzipTemp(input_tf_zip.filename, [
- "*/boot.img", "*/dtbo.img"])
+ OPTIONS.input_tmp = common.UnzipTemp(input_tf_zip.filename, files_to_unzip)
else:
- common.UnzipToDir(input_tf_zip, OPTIONS.input_tmp, [
- "*/boot.img", "*/dtbo.img"])
+ common.UnzipToDir(input_tf_zip.filename, OPTIONS.input_tmp, files_to_unzip)
unzip_dir = OPTIONS.input_tmp
- image_dir = os.path.join(unzip_dir, "IMAGES")
- shutil.rmtree(image_dir)
- os.makedirs(image_dir, exist_ok=True)
boot_image = common.GetBootableImage(
"IMAGES/boot.img", "boot.img", unzip_dir, "BOOT", misc_info)
@@ -601,37 +599,64 @@
boot_image = os.path.join(unzip_dir, boot_image.name)
common.ZipWrite(output_tf_zip, boot_image, "IMAGES/boot.img",
compress_type=zipfile.ZIP_STORED)
- add_img_to_target_files.AddDtbo(output_tf_zip)
+ if misc_info.get("has_dtbo") == "true":
+ add_img_to_target_files.AddDtbo(output_tf_zip)
return unzip_dir
-def RegenerateBootOTA(input_tf_zip: zipfile.ZipFile, output_tf_zip: zipfile.ZipFile, misc_info, filename, input_ota):
- if filename not in ["VENDOR/boot_otas/boot_ota_4k.zip", "SYSTEM/boot_otas/boot_ota_4k.zip"]:
- # We only need to re-generate 4K boot OTA, for other OTA packages
- # simply copy as is
- with input_tf_zip.open(filename, "r") as in_fp:
- shutil.copyfileobj(in_fp, input_ota)
- input_ota.flush()
+def RegenerateBootOTA(input_tf_zip: zipfile.ZipFile, filename, input_ota):
+ with input_tf_zip.open(filename, "r") as in_fp:
+ payload = update_payload.Payload(in_fp)
+ is_incremental = any([part.HasField('old_partition_info')
+ for part in payload.manifest.partitions])
+ is_boot_ota = filename.startswith(
+ "VENDOR/boot_otas/") or filename.startswith("SYSTEM/boot_otas/")
+ if not is_boot_ota:
return
- timestamp = misc_info["build.prop"].GetProp(
- "ro.system.build.date.utc")
- unzip_dir = RegenerateKernelPartitions(
- input_tf_zip, output_tf_zip, misc_info)
- signed_boot_image = os.path.join(unzip_dir, "IMAGES/boot.img")
- signed_dtbo_image = os.path.join(unzip_dir, "IMAGES/dtbo.img")
+ is_4k_boot_ota = filename in [
+ "VENDOR/boot_otas/boot_ota_4k.zip", "SYSTEM/boot_otas/boot_ota_4k.zip"]
+ # Only 4K boot image is re-generated, so if 16K boot ota isn't incremental,
+ # we do not need to re-generate
+ if not is_4k_boot_ota and not is_incremental:
+ return
+ timestamp = str(payload.manifest.max_timestamp)
+ partitions = [part.partition_name for part in payload.manifest.partitions]
+ unzip_dir = OPTIONS.input_tmp
+ signed_boot_image = os.path.join(unzip_dir, "IMAGES", "boot.img")
if not os.path.exists(signed_boot_image):
logger.warn("Need to re-generate boot OTA {} but failed to get signed boot image. 16K dev option will be impacted, after rolling back to 4K user would need to sideload/flash their device to continue receiving OTAs.")
return
- logger.info(
- "Re-generating boot OTA {} with timestamp {}".format(filename, timestamp))
+ signed_dtbo_image = os.path.join(unzip_dir, "IMAGES", "dtbo.img")
+ if "dtbo" in partitions and not os.path.exists(signed_dtbo_image):
+ raise ValueError(
+ "Boot OTA {} has dtbo partition, but no dtbo image found in target files.".format(filename))
+ if is_incremental:
+ signed_16k_boot_image = os.path.join(
+ unzip_dir, "IMAGES", "boot_16k.img")
+ signed_16k_dtbo_image = os.path.join(
+ unzip_dir, "IMAGES", "dtbo_16k.img")
+ if is_4k_boot_ota:
+ if os.path.exists(signed_16k_boot_image):
+ signed_boot_image = signed_16k_boot_image + ":" + signed_boot_image
+ if os.path.exists(signed_16k_dtbo_image):
+ signed_dtbo_image = signed_16k_dtbo_image + ":" + signed_dtbo_image
+ else:
+ if os.path.exists(signed_16k_boot_image):
+ signed_boot_image += ":" + signed_16k_boot_image
+ if os.path.exists(signed_16k_dtbo_image):
+ signed_dtbo_image += ":" + signed_16k_dtbo_image
+
+
args = ["ota_from_raw_img", "--package_key", OPTIONS.package_key,
"--max_timestamp", timestamp, "--output", input_ota.name]
- if os.path.exists(signed_dtbo_image):
+ if "dtbo" in partitions:
args.extend(["--partition_name", "boot,dtbo",
signed_boot_image, signed_dtbo_image])
else:
args.extend(["--partition_name", "boot", signed_boot_image])
+ logger.info(
+ "Re-generating boot OTA {} using cmd {}".format(filename, args))
ota_from_raw_img.main(args)
@@ -657,6 +682,8 @@
if misc_info.get('avb_enable') == 'true':
RewriteAvbProps(misc_info)
+ RegenerateKernelPartitions(input_tf_zip, output_tf_zip, misc_info)
+
for info in input_tf_zip.infolist():
filename = info.filename
if filename.startswith("IMAGES/"):
@@ -667,10 +694,10 @@
if filename.startswith("OTA/") and filename.endswith(".img"):
continue
- data = input_tf_zip.read(filename)
- out_info = copy.copy(info)
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
filename, compressed_extension, OPTIONS.skip_apks_with_path_prefix)
+ data = input_tf_zip.read(filename)
+ out_info = copy.copy(info)
if is_apk and should_be_skipped:
# Copy skipped APKs verbatim.
@@ -734,8 +761,7 @@
elif filename.endswith(".zip") and IsEntryOtaPackage(input_tf_zip, filename):
logger.info("Re-signing OTA package {}".format(filename))
with tempfile.NamedTemporaryFile() as input_ota, tempfile.NamedTemporaryFile() as output_ota:
- RegenerateBootOTA(input_tf_zip, output_tf_zip,
- misc_info, filename, input_ota)
+ RegenerateBootOTA(input_tf_zip, filename, input_ota)
SignOtaPackage(input_ota.name, output_ota.name)
common.ZipWrite(output_tf_zip, output_ota.name, filename,
@@ -1131,9 +1157,9 @@
common.ZipWriteStr(output_zip, filename, temp_file.getvalue())
-def ReplaceOtaKeys(input_tf_zip, output_tf_zip, misc_info):
+def ReplaceOtaKeys(input_tf_zip: zipfile.ZipFile, output_tf_zip, misc_info):
try:
- keylist = input_tf_zip.read("META/otakeys.txt").split()
+ keylist = input_tf_zip.read("META/otakeys.txt").decode().split()
except KeyError:
raise common.ExternalError("can't read META/otakeys.txt from input")