openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Dan Willemsen 2019-08-08 10:58:09 -07:00
parent 0b690ed6d9
commit 8da52d4b9d
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/core.mk
View File

@ -42,6 +42,9 @@ endef
backslash := \a backslash := \a
backslash := $(patsubst %a,%,$(backslash)) backslash := $(patsubst %a,%,$(backslash))
TOP :=$= .
TOPDIR :=$=
# Prevent accidentally changing these variables # Prevent accidentally changing these variables
.KATI_READONLY := SHELL empty space comma newline pound backslash .KATI_READONLY := SHELL empty space comma newline pound backslash

14
core/main.mk
View File

@ -1,14 +1,3 @@
# 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 ifndef KATI
$(warning Calling make directly is no longer supported.) $(warning Calling make directly is no longer supported.)
$(warning Either use 'envsetup.sh; m' or 'build/soong/soong_ui.bash --make-mode') $(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. # the top of the source tree, for example when "make -C" is used in m/mm/mmm.
PWD := $(shell pwd) PWD := $(shell pwd)
TOP := .
TOPDIR :=
# This is the default target. It must be the first declared target. # This is the default target. It must be the first declared target.
.PHONY: droid .PHONY: droid
DEFAULT_GOAL := droid DEFAULT_GOAL := droid