diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-02 19:58:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 19:58:45 +0000 |
| commit | 7e3f5430a8b844d0e67d958793524e0f69b8d6e4 (patch) | |
| tree | d4de9a40b51193f81bcb0b887d98b0eb6eab0c59 | |
| parent | f2507339e5a40320e2c3f0484363728c695b5fd4 (diff) | |
| parent | 36c1435ec4ac40dc273c916028d7f818f71ae9f3 (diff) | |
| download | build-temp_RQ2A.210305.007.tar.gz | |
Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435ec4temp_RQ2A.210305.007
Original change: https://android-review.googlesource.com/c/platform/build/+/1595337
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifc7f272e273f54df843650e7e74fcad40a76994a
| -rw-r--r-- | core/config.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk index 3bd3622751..6a99a6c7f9 100644 --- a/core/config.mk +++ b/core/config.mk @@ -1163,8 +1163,11 @@ endif dont_bother_goals := out \ product-graph dump-products -ifeq ($(CALLED_FROM_SETUP),true) +# Make ANDROID Soong config variables visible to Android.mk files, for +# consistency with those defined in BoardConfig.mk files. include $(BUILD_SYSTEM)/android_soong_config_vars.mk + +ifeq ($(CALLED_FROM_SETUP),true) include $(BUILD_SYSTEM)/ninja_config.mk include $(BUILD_SYSTEM)/soong_config.mk endif |