diff options
| -rw-r--r-- | boot_control_copy/bootinfo.c | 2 | ||||
| -rw-r--r-- | brillo_config/Android.mk | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/boot_control_copy/bootinfo.c b/boot_control_copy/bootinfo.c index 66ccba25..dbc0757c 100644 --- a/boot_control_copy/bootinfo.c +++ b/boot_control_copy/bootinfo.c @@ -43,7 +43,7 @@ static struct fstab *open_fstab(void) if (fstab != NULL) return fstab; - fstab = fs_mgr_read_fstab_with_dt("/fstab.device"); + fstab = fs_mgr_read_fstab("/fstab.device"); return fstab; } diff --git a/brillo_config/Android.mk b/brillo_config/Android.mk index 7c1dd6c2..fb0cd754 100644 --- a/brillo_config/Android.mk +++ b/brillo_config/Android.mk @@ -36,6 +36,20 @@ $(LOCAL_BUILT_MODULE): $(hide) mkdir -p $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY) ln -sf /oem/$(OSRELEASED_DIRECTORY)/product_id $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY) +include $(CLEAR_VARS) +LOCAL_MODULE := system_id +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY) +include $(BUILD_SYSTEM)/base_rules.mk + +# Attempt to populate the system id from a file in the product path. +LOADED_BRILLO_SYSTEM_ID := $(call cfgtree-get-if-exists,brillo/system_id) + +$(LOCAL_BUILT_MODULE): BRILLO_SYSTEM_ID ?= "$(LOADED_BRILLO_SYSTEM_ID)" +$(LOCAL_BUILT_MODULE): + $(hide) mkdir -p $(dir $@) + echo $(BRILLO_SYSTEM_ID) > $@ + include $(CLEAR_VARS) LOCAL_MODULE := product_version |