File tree Expand file tree Collapse file tree 2 files changed +9
-0
lines changed
base/cvd/cuttlefish/host/commands/assemble_cvd Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -60,6 +60,7 @@ cf_cc_binary(
6060 "//cuttlefish/host/libs/config:ap_boot_flow" ,
6161 "//cuttlefish/host/libs/config:config_flag" ,
6262 "//cuttlefish/host/libs/config:custom_actions" ,
63+ "//cuttlefish/host/libs/config:cuttlefish_config" ,
6364 "//cuttlefish/host/libs/config:fetcher_config" ,
6465 "//cuttlefish/host/libs/config:fetcher_configs" ,
6566 "//cuttlefish/host/libs/config/adb" ,
Original file line number Diff line number Diff line change 6464#include " cuttlefish/host/libs/config/adb/adb.h"
6565#include " cuttlefish/host/libs/config/config_flag.h"
6666#include " cuttlefish/host/libs/config/custom_actions.h"
67+ #include " cuttlefish/host/libs/config/cuttlefish_config.h"
6768#include " cuttlefish/host/libs/config/defaults/defaults.h"
6869#include " cuttlefish/host/libs/config/fastboot/fastboot.h"
6970#include " cuttlefish/host/libs/config/fetcher_configs.h"
@@ -410,6 +411,13 @@ Result<const CuttlefishConfig*> InitFilesystemAndCreateConfig(
410411 CF_EXPECT (EnsureDirectoryExists (dir, default_mode, default_group));
411412 }
412413
414+ for (size_t index = 0 ; index < android_builds.Size (); index++) {
415+ const CuttlefishConfig::InstanceSpecific& instance =
416+ const_cast <const CuttlefishConfig&>(config).ForInstance (index);
417+ AndroidBuild& build = android_builds.ForIndex (index);
418+ CF_EXPECT (build.SetExtractDir (instance.instance_dir ()));
419+ }
420+
413421 if (!snapshot_path.empty ()) {
414422 SharedFD temp = SharedFD::Creat (config.AssemblyPath (" restore" ), 0660 );
415423 if (!temp->IsOpen ()) {
You can’t perform that action at this time.
0 commit comments