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

Commit 8da52d4b authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Move TOP/TOPDIR to build/make/common/core.mk 

So that they're set properly during dumpvars / product loading.

SHELL is already set in common/core.mk, so it's not necessary to be in
core/main.mk as well (which quickly loads core/config.mk, which loads
common/core.mk).

Test: get_build_var TOP
Test: get_build_var TOPDIR
Change-Id: I8179ac32628b74ccf29851dc53bf83cfb4b280fd
parent 0b690ed6

common/core.mk

+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

core/main.mk

+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