From 368d8a30500140af9220ff40b5ae9b4d476261e6 Mon Sep 17 00:00:00 2001 From: Sen Jiang Date: Fri, 24 Mar 2017 12:44:58 -0700 Subject: [PATCH] os-release.d: Add system_id. This is the app id of the SoM stored in the system. Test: adb shell cat /etc/os-release.d/system_id Change-Id: Iba7ac028ffa7402f06fbf9c4a3a077eb3414940e (cherry picked from commit d41148b6c8d59d4f35711028248fc644428ddc57) --- brillo_config/Android.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 -- 2.11.0