Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a190264 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."" am:... 

Merge "Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."" am: bcfaaf9e am: 058ef86a

Original change: https://android-review.googlesource.com/c/platform/build/+/1486317

Change-Id: Ifd9985fe6516eabf302c6743899a812cf25ae67e
parents 215d75ca 058ef86a

core/main.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -1899,6 +1899,11 @@ tidy_only: 
ndk: $(SOONG_OUT_DIR)/ndk.timestamp

ndk: $(SOONG_OUT_DIR)/ndk.timestamp

.PHONY: ndk

.PHONY: ndk





# Checks that build/soong/apex/allowed_deps.txt remains up to date

ifneq ($(UNSAFE_DISABLE_APEX_ALLOWED_DEPS_CHECK),true)

  droidcore: ${APEX_ALLOWED_DEPS_CHECK}

endif



$(call dist-write-file,$(KATI_PACKAGE_MK_DIR)/dist.mk)

$(call dist-write-file,$(KATI_PACKAGE_MK_DIR)/dist.mk)





$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] writing build rules ...)
 
$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] writing build rules ...)