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

Commit 53a95490 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Move TOP/TOPDIR to build/make/common/core.mk" am: d1e2827f am:...

Merge "Move TOP/TOPDIR to build/make/common/core.mk" am: d1e2827f am: 184305d9 am: d828da3c am: 9cf966fd
am: a3913f81

Change-Id: I550d27b0ac6124b66e1e2991577b5f8c327a6ccd
parents 834eba6d a3913f81
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ endef
backslash := \a
backslash := $(patsubst %a,%,$(backslash))

TOP :=$= .
TOPDIR :=$=

# Prevent accidentally changing these variables
.KATI_READONLY := SHELL empty space comma newline pound backslash

+0 −14
Original line number Diff line number Diff line
# Only use ANDROID_BUILD_SHELL to wrap around bash.
# DO NOT use other shells such as zsh.
ifdef ANDROID_BUILD_SHELL
SHELL := $(ANDROID_BUILD_SHELL)
else
# Use bash, not whatever shell somebody has installed as /bin/sh
# This is repeated in config.mk, since envsetup.sh runs that file
# directly.
SHELL := /bin/bash
endif

ifndef KATI
$(warning Calling make directly is no longer supported.)
$(warning Either use 'envsetup.sh; m' or 'build/soong/soong_ui.bash --make-mode')
@@ -22,9 +11,6 @@ $(info [1/1] initializing build system ...)
# the top of the source tree, for example when "make -C" is used in m/mm/mmm.
PWD := $(shell pwd)

TOP := .
TOPDIR :=

# This is the default target.  It must be the first declared target.
.PHONY: droid
DEFAULT_GOAL := droid