diff options
| -rwxr-xr-x | ci/build_metadata | 20 | ||||
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/android_soong_config_vars.mk | 6 | ||||
| -rw-r--r-- | shell_utils.sh | 16 | ||||
| -rw-r--r-- | target/product/security/Android.bp | 8 | ||||
| -rw-r--r-- | tools/aconfig/aconfig/src/codegen/java.rs | 7 | ||||
| -rw-r--r-- | tools/aconfig/aconfig/src/commands.rs | 2 | ||||
| -rw-r--r-- | tools/aconfig/aconfig/src/main.rs | 12 |
8 files changed, 67 insertions, 6 deletions
diff --git a/ci/build_metadata b/ci/build_metadata index cd011c8679..3e9218f200 100755 --- a/ci/build_metadata +++ b/ci/build_metadata @@ -14,15 +14,31 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -ex +set -x + +source build/make/shell_utils.sh export TARGET_PRODUCT=aosp_arm64 export TARGET_RELEASE=trunk_staging export TARGET_BUILD_VARIANT=eng +import_build_vars \ + OUT_DIR \ + DIST_DIR \ + HOST_OUT_EXECUTABLES \ + || exit $? + TARGETS=( all_teams + source_tree_size release_config_metadata ) -build/soong/bin/m dist ${TARGETS[@]} +# Build modules +build/soong/bin/m dist ${TARGETS[@]} || exit $? + +# List all source files in the tree +( \ + $HOST_OUT_EXECUTABLES/source_tree_size -o $DIST_DIR/all_source_tree_files.pb \ + && gzip -fn $DIST_DIR/all_source_tree_files.pb \ +) || exit $? diff --git a/core/Makefile b/core/Makefile index c2d7308454..e106dadda2 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2649,7 +2649,7 @@ ifndef TARGET_PRIVATE_RES_DIRS TARGET_PRIVATE_RES_DIRS := $(wildcard $(TARGET_DEVICE_DIR)/recovery/res) endif recovery_resource_deps := $(shell find $(recovery_resources_common) \ - $(TARGET_PRIVATE_RES_DIRS) -type f) + $(TARGET_PRIVATE_RES_DIRS) -type f -not -name "*.bp") recovery_resource_deps += $(generated_recovery_text_files) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 092ddb08d7..70ef5d912e 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -272,3 +272,9 @@ $(call soong_config_set_bool,fs_config,system_dlkm,$(if $(BOARD_USES_SYSTEM_DLKM $(call soong_config_set_bool,telephony,sec_cp_secure_boot,$(if $(filter true,$(SEC_CP_SECURE_BOOT)),true,false)) $(call soong_config_set_bool,telephony,cbd_protocol_sit,$(if $(filter true,$(CBD_PROTOCOL_SIT)),true,false)) $(call soong_config_set_bool,telephony,use_radioexternal_hal_aidl,$(if $(filter true,$(USE_RADIOEXTERNAL_HAL_AIDL)),true,false)) + +# Variables for hwcomposer.$(TARGET_BOARD_PLATFORM) +$(call soong_config_set_bool,google_graphics,board_uses_hwc_services,$(if $(filter true,$(BOARD_USES_HWC_SERVICES)),true,false)) + +# Variables for controlling android.hardware.composer.hwc3-service.pixel +$(call soong_config_set,google_graphics,board_hwc_version,$(BOARD_HWC_VERSION)) diff --git a/shell_utils.sh b/shell_utils.sh index 9053c42e75..3124db598c 100644 --- a/shell_utils.sh +++ b/shell_utils.sh @@ -214,3 +214,19 @@ function log_tool_invocation() ' SIGINT SIGTERM SIGQUIT EXIT } +# Import the build variables supplied as arguments into this shell's environment. +# For absolute variables, prefix the variable name with a '/'. For example: +# import_build_vars OUT_DIR DIST_DIR /HOST_OUT_EXECUTABLES +# Returns nonzero if the build command failed. Stderr is passed through. +function import_build_vars() +{ + require_top + local script + script=$(cd $TOP && build/soong/bin/get_build_vars "$@") + local ret=$? + if [ $ret -ne 0 ] ; then + return $ret + fi + eval "$script" + return $? +} diff --git a/target/product/security/Android.bp b/target/product/security/Android.bp index ffbec0616e..214c009ec8 100644 --- a/target/product/security/Android.bp +++ b/target/product/security/Android.bp @@ -33,7 +33,13 @@ prebuilt_etc { // image otacerts_zip { name: "otacerts", - recovery_available: true, + relative_install_path: "security", + filename: "otacerts.zip", +} + +otacerts_zip { + name: "otacerts.recovery", + recovery: true, relative_install_path: "security", filename: "otacerts.zip", } diff --git a/tools/aconfig/aconfig/src/codegen/java.rs b/tools/aconfig/aconfig/src/codegen/java.rs index 7aff4e918a..6674d0221e 100644 --- a/tools/aconfig/aconfig/src/codegen/java.rs +++ b/tools/aconfig/aconfig/src/codegen/java.rs @@ -33,6 +33,7 @@ pub fn generate_java_code<I>( flag_ids: HashMap<String, u16>, allow_instrumentation: bool, package_fingerprint: u64, + new_exported: bool, ) -> Result<Vec<OutputFile>> where I: Iterator<Item = ProtoParsedFlag>, @@ -60,6 +61,7 @@ where container, is_platform_container, package_fingerprint: format!("0x{:X}L", package_fingerprint), + new_exported, }; let mut template = TinyTemplate::new(); template.add_template("Flags.java", include_str!("../../templates/Flags.java.template"))?; @@ -129,6 +131,7 @@ struct Context { pub container: String, pub is_platform_container: bool, pub package_fingerprint: String, + pub new_exported: bool, } #[derive(Serialize, Debug)] @@ -530,6 +533,7 @@ mod tests { flag_ids, true, 5801144784618221668, + false, ) .unwrap(); let expect_flags_content = EXPECTED_FLAG_COMMON_CONTENT.to_string() @@ -685,6 +689,7 @@ mod tests { flag_ids, true, 5801144784618221668, + false, ) .unwrap(); @@ -884,6 +889,7 @@ mod tests { flag_ids, true, 5801144784618221668, + false, ) .unwrap(); @@ -1006,6 +1012,7 @@ mod tests { flag_ids, true, 5801144784618221668, + false, ) .unwrap(); let expect_featureflags_content = r#" diff --git a/tools/aconfig/aconfig/src/commands.rs b/tools/aconfig/aconfig/src/commands.rs index 3f869de83e..4c06462cb3 100644 --- a/tools/aconfig/aconfig/src/commands.rs +++ b/tools/aconfig/aconfig/src/commands.rs @@ -218,6 +218,7 @@ pub fn create_java_lib( mut input: Input, codegen_mode: CodegenMode, allow_instrumentation: bool, + new_exported: bool, ) -> Result<Vec<OutputFile>> { let parsed_flags = input.try_parse_flags()?; let modified_parsed_flags = modify_parsed_flags_based_on_mode(parsed_flags, codegen_mode)?; @@ -236,6 +237,7 @@ pub fn create_java_lib( flag_ids, allow_instrumentation, package_fingerprint, + new_exported, ) } diff --git a/tools/aconfig/aconfig/src/main.rs b/tools/aconfig/aconfig/src/main.rs index c3902884f6..288786b095 100644 --- a/tools/aconfig/aconfig/src/main.rs +++ b/tools/aconfig/aconfig/src/main.rs @@ -85,6 +85,12 @@ fn cli() -> Command { .long("allow-instrumentation") .value_parser(clap::value_parser!(bool)) .default_value("false"), + ) + .arg( + Arg::new("new-exported") + .long("new-exported") + .value_parser(clap::value_parser!(bool)) + .default_value("false"), ), ) .subcommand( @@ -267,8 +273,10 @@ fn main() -> Result<()> { let mode = get_required_arg::<CodegenMode>(sub_matches, "mode")?; let allow_instrumentation = get_required_arg::<bool>(sub_matches, "allow-instrumentation")?; - let generated_files = commands::create_java_lib(cache, *mode, *allow_instrumentation) - .context("failed to create java lib")?; + let new_exported = get_required_arg::<bool>(sub_matches, "new-exported")?; + let generated_files = + commands::create_java_lib(cache, *mode, *allow_instrumentation, *new_exported) + .context("failed to create java lib")?; let dir = PathBuf::from(get_required_arg::<String>(sub_matches, "out")?); generated_files .iter() |