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

Commit 86eeedbc authored by Logan Chien's avatar Logan Chien
Browse files

Add $(SOONG_OUT_DIR)/ndk/% to artifact whitelist 

This commit adds `$(SOONG_OUT_DIR)/ndk/%` to artifact whitelist so that
when NDK stub libraries won't be blocked by artifact path requirements.

This commit does not break the integrity of artifact path requirements
because they are not installed to devices.

Bug: 123053270
Bug: 119084334
Test: lunch aosp_crosshatch-userdebug
Change-Id: Ieea76a8126269f53b0a58bd069b449a9f9b1263a
parent 4ac78107

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -1085,8 +1085,8 @@ ifdef FULL_BUILD 
  # Verify the artifact path requirements made by included products.

  is_asan := $(if $(filter address,$(SANITIZE_TARGET)),true)

  ifneq (true,$(or $(is_asan),$(DISABLE_ARTIFACT_PATH_REQUIREMENTS)))

  # Fakes don't get installed, and host files are irrelevant.

  static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/%

  # Fakes don't get installed, host files are irrelevant, and NDK stubs aren't installed to device.

  static_whitelist_patterns := $(TARGET_OUT_FAKE)/% $(HOST_OUT)/% $(SOONG_OUT_DIR)/ndk/%

  # RROs become REQUIRED by the source module, but are always placed on the vendor partition.

  static_whitelist_patterns += %__auto_generated_rro.apk

  ifeq (true,$(BOARD_USES_SYSTEM_OTHER_ODEX))