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

Commit c45c9400 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "macOS calls itself Darwin." am: 33dfa52c am: 21e1dba2 am: 1d4fd1bf 

am: 826ac190

Change-Id: I166e7f6c52a78a6d51b8d1e7b93d7dc398b11530
parents 9d894383 826ac190

core/envsetup.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -111,9 +111,6 @@ endif 
ifneq (,$(findstring Darwin,$(UNAME)))

ifneq (,$(findstring Darwin,$(UNAME)))

  HOST_OS := darwin

  HOST_OS := darwin

endif

endif

ifneq (,$(findstring Macintosh,$(UNAME)))

  HOST_OS := darwin

endif





HOST_OS_EXTRA := $(shell uname -rsm)

HOST_OS_EXTRA := $(shell uname -rsm)

ifeq ($(HOST_OS),linux)

ifeq ($(HOST_OS),linux)