Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 666fb157 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not force rebuilds after changing host kernel." am: cecd960e 

Original change: https://android-review.googlesource.com/c/platform/build/+/2283394



Change-Id: I90d6eb79a399a5821fd03fa6cbe852479d6ddf01
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b67fdb4f cecd960e

core/envsetup.mk

+9 −7
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ ifneq (,$(findstring Darwin,$(UNAME))) 
  HOST_OS := darwin

endif



ifeq ($(CALLED_FROM_SETUP),true)

  HOST_OS_EXTRA := $(shell uname -rsm)

  ifeq ($(HOST_OS),linux)

    ifneq ($(wildcard /etc/os-release),)
@@ -144,6 +145,7 @@ else ifeq ($(HOST_OS),darwin) 
    HOST_OS_EXTRA += $(shell sw_vers -productVersion)

  endif

  HOST_OS_EXTRA := $(subst $(space),-,$(HOST_OS_EXTRA))

endif



# BUILD_OS is the real host doing the build.

BUILD_OS := $(HOST_OS)