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

Commit 14e10263 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix PHONY uses found by --warn_real_to_phony 

Switch a use of `ndk` to the timestamp file that `ndk` depends on
itself.

Mark more module-specific rules as PHONY.

Test: diff build-aosp_arm.ninja (stripping _kati_always_build_)
Test: Turn on --warn_real_to_phony for Kati, see fewer warnings
Change-Id: I101ced4067780e38d18820f5d916596429087e49
parent 64931186

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2917,7 +2917,7 @@ endif 
# -----------------------------------------------------------------

# NDK Sysroot Package

NDK_SYSROOT_TARGET := $(PRODUCT_OUT)/ndk_sysroot.tar.bz2

$(NDK_SYSROOT_TARGET): ndk

$(NDK_SYSROOT_TARGET): $(SOONG_OUT_DIR)/ndk.timestamp

	@echo Package NDK sysroot...

	$(hide) tar cjf $@ -C $(SOONG_OUT_DIR) ndk

core/base_rules.mk

+2 −0
Original line number Diff line number Diff line
@@ -793,8 +793,10 @@ ifneq (,$(filter $(my_module_tags),tests)) 
$(j_or_n)-$(h_or_t)-tests $(j_or_n)-tests $(h_or_t)-tests : $(my_checked_module)

endif

$(LOCAL_MODULE)-$(h_or_hc_or_t) : $(my_all_targets)

.PHONY: $(LOCAL_MODULE)-$(h_or_hc_or_t)

ifeq ($(j_or_n),native)

$(LOCAL_MODULE)-$(h_or_hc_or_t)$(my_32_64_bit_suffix) : $(my_all_targets)

.PHONY: $(LOCAL_MODULE)-$(h_or_hc_or_t)$(my_32_64_bit_suffix)

endif

endif