| commit | b8e6e297e325fdfba58dad2c7d9fef9acb530ecd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jun 06 01:47:19 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 06 01:47:19 2024 +0000 |
| tree | 9c5227a4cd76f807872c225cb0da2807cb1d54ae | |
| parent | 154682ce069aa5fb283686426d134c34946d75b0 [diff] | |
| parent | 8e0ce358290e0272a1ae5f261438cb8fbb68322d [diff] |
Merge "Include sdk-preprocess-files.mk before process sdk.atree" into main am: 8e0ce35829 Original change: https://android-review.googlesource.com/c/platform/build/+/3113080 Change-Id: Ibff56dd869895c5bf1cb77190d91aff6e026e81b 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"