From 79fd69693965e943b695843aa204c17d706c8cbe Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 28 Nov 2017 22:32:05 -0800 Subject: Switch unused deprecated variables to obsolete These have no references in our master trees, so can now be marked as obsolete. Test: grep -R " has been" Change-Id: I72d2371176e78f38ed56741dd8527193eec7eae3 --- Changes.md | 7 ++++--- core/config.mk | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Changes.md b/Changes.md index 05f54b81da..53ff007f21 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,6 @@ # 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, 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 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 -this to obsolete, and any references will become errors. +(or written) inside Kati. Once all the warnings have been removed for a +particular variable, we'll switch it to obsolete, and any references will become +errors. ### envsetup.sh variables with make equivalents diff --git a/core/config.mk b/core/config.mk index 4bae6b39f9..3f518877ab 100644 --- a/core/config.mk +++ b/core/config.mk @@ -61,14 +61,14 @@ backslash := $(patsubst %a,%,$(backslash)) # Mark variables deprecated/obsolete 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 PYTHONPATH,Do not use PYTHONPATH directly. See $(CHANGES_URL)#PYTHONPATH) -$(KATI_deprecated_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 PYTHONPATH,Do not use PYTHONPATH directly. See $(CHANGES_URL)#PYTHONPATH) +$(KATI_obsolete_var OUT,Use OUT_DIR instead. See $(CHANGES_URL)#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_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_HOST_OUT_TESTCASES,Use HOST_OUT_TESTCASES instead. See $(CHANGES_URL)#ANDROID_HOST_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 \ +$(KATI_obsolete_var \ ANDROID_TOOLCHAIN \ ANDROID_TOOLCHAIN_2ND_ARCH \ ANDROID_DEV_SCRIPTS \ -- cgit v1.2.3