| commit | 283f582176f436f7f852729f16eb8cf0e6a86c59 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jun 06 02:01:52 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 06 02:01:52 2024 +0000 |
| tree | 9fb6aef4be3cf0c828e76df8182ea57a2aebdb9f | |
| parent | 06f09f1e326afac68643305084966065e55d775e [diff] | |
| parent | b8e6e297e325fdfba58dad2c7d9fef9acb530ecd [diff] |
Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am: 8e0ce35829 am: b8e6e297e3 Original change: https://android-review.googlesource.com/c/platform/build/+/3113080 Change-Id: I06ffb2cc58ae522e10a441ccfe14a44456d0936b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/Makefile b/core/Makefile index a215d31..9845437 100644 --- a/core/Makefile +++ b/core/Makefile
@@ -7605,6 +7605,7 @@ sdk_dep_file := $(sdk_dir)/sdk_deps.mk ATREE_FILES := +include development/build/tools/sdk-preprocess-files.mk -include $(sdk_dep_file) # if we don't have a real list, then use "everything"