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

Merge "Switch unused deprecated variables to obsolete"

This commit is contained in:
Dan Willemsen 2017-11-30 01:49:11 +00:00 committed by Gerrit Code Review
parent 9ddf8ea3a5 79fd696939
commit f170166521
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Changes.md
View File

@ -1,6 +1,6 @@
# Build System Changes for Android.mk Writers # Build System Changes for Android.mk Writers
## Deprecating envsetup.sh variables in Makefiles ## Deprecating / obsoleting envsetup.sh variables in Makefiles
It is not required to source envsetup.sh before running a build. Many scripts, It is not required to source envsetup.sh before running a build. Many scripts,
including a majority of our automated build systems, do not do so. Make will including a majority of our automated build systems, do not do so. Make will
@ -14,8 +14,9 @@ you move the source tree.
To fix this, we're marking the variables that are set in envsetup.sh as To fix this, we're marking the variables that are set in envsetup.sh as
deprecated in the makefiles. This will trigger a warning every time one is read deprecated in the makefiles. This will trigger a warning every time one is read
(or written) inside Kati. Once all the warnings have been removed, we'll switch (or written) inside Kati. Once all the warnings have been removed for a
this to obsolete, and any references will become errors. particular variable, we'll switch it to obsolete, and any references will become
errors.
### envsetup.sh variables with make equivalents ### envsetup.sh variables with make equivalents

12
core/config.mk
View File

@ -61,14 +61,14 @@ backslash := $(patsubst %a,%,$(backslash))
# Mark variables deprecated/obsolete # Mark variables deprecated/obsolete
CHANGES_URL := https://android.googlesource.com/platform/build/+/master/Changes.md CHANGES_URL := https://android.googlesource.com/platform/build/+/master/Changes.md
$(KATI_deprecated_var PATH,Do not use PATH directly. See $(CHANGES_URL)#PATH) $(KATI_deprecated_var PATH,Do not use PATH directly. See $(CHANGES_URL)#PATH)
$(KATI_deprecated_var PYTHONPATH,Do not use PYTHONPATH directly. See $(CHANGES_URL)#PYTHONPATH) $(KATI_obsolete_var PYTHONPATH,Do not use PYTHONPATH directly. See $(CHANGES_URL)#PYTHONPATH)
$(KATI_deprecated_var OUT,Use OUT_DIR instead. See $(CHANGES_URL)#OUT) $(KATI_obsolete_var OUT,Use OUT_DIR instead. See $(CHANGES_URL)#OUT)
$(KATI_deprecated_var ANDROID_HOST_OUT,Use HOST_OUT instead. See $(CHANGES_URL)#ANDROID_HOST_OUT) $(KATI_obsolete_var ANDROID_HOST_OUT,Use HOST_OUT instead. See $(CHANGES_URL)#ANDROID_HOST_OUT)
$(KATI_deprecated_var ANDROID_PRODUCT_OUT,Use PRODUCT_OUT instead. See $(CHANGES_URL)#ANDROID_PRODUCT_OUT) $(KATI_deprecated_var ANDROID_PRODUCT_OUT,Use PRODUCT_OUT instead. See $(CHANGES_URL)#ANDROID_PRODUCT_OUT)
$(KATI_deprecated_var ANDROID_HOST_OUT_TESTCASES,Use HOST_OUT_TESTCASES instead. See $(CHANGES_URL)#ANDROID_HOST_OUT_TESTCASES) $(KATI_obsolete_var ANDROID_HOST_OUT_TESTCASES,Use HOST_OUT_TESTCASES instead. See $(CHANGES_URL)#ANDROID_HOST_OUT_TESTCASES)
$(KATI_deprecated_var ANDROID_TARGET_OUT_TESTCASES,Use TARGET_OUT_TESTCASES instead. See $(CHANGES_URL)#ANDROID_TARGET_OUT_TESTCASES) $(KATI_obsolete_var ANDROID_TARGET_OUT_TESTCASES,Use TARGET_OUT_TESTCASES instead. See $(CHANGES_URL)#ANDROID_TARGET_OUT_TESTCASES)
$(KATI_deprecated_var ANDROID_BUILD_TOP,Use '.' instead. See $(CHANGES_URL)#ANDROID_BUILD_TOP) $(KATI_deprecated_var ANDROID_BUILD_TOP,Use '.' instead. See $(CHANGES_URL)#ANDROID_BUILD_TOP)
$(KATI_deprecated_var \ $(KATI_obsolete_var \
ANDROID_TOOLCHAIN \ ANDROID_TOOLCHAIN \
ANDROID_TOOLCHAIN_2ND_ARCH \ ANDROID_TOOLCHAIN_2ND_ARCH \
ANDROID_DEV_SCRIPTS \ ANDROID_DEV_SCRIPTS \