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

Commit 20a7bfe4 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

Merge "Revert^6 "Enforce <uses-library> check for Android.mk modules."" into sc-dev am: 235f1507 

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

Change-Id: I5dd8d05fb7d2005091e79b32a83c5c80bd34dddd
parents 2ee9b448 235f1507

core/dex_preopt_odex_install.mk

+2 −7
Original line number Original line Diff line number Diff line
@@ -227,15 +227,10 @@ else ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)) 
  LOCAL_ENFORCE_USES_LIBRARIES := false

  LOCAL_ENFORCE_USES_LIBRARIES := false

endif

endif





# Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES

# Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES against the manifest.

# If LOCAL_ENFORCE_USES_LIBRARIES is not set, default to true if either of LOCAL_USES_LIBRARIES or

# LOCAL_OPTIONAL_USES_LIBRARIES are specified.

# Will change the default to true unconditionally in the future.

ifndef LOCAL_ENFORCE_USES_LIBRARIES

ifndef LOCAL_ENFORCE_USES_LIBRARIES

  ifneq (,$(strip $(LOCAL_USES_LIBRARIES)$(LOCAL_OPTIONAL_USES_LIBRARIES)))

  LOCAL_ENFORCE_USES_LIBRARIES := true

  LOCAL_ENFORCE_USES_LIBRARIES := true

endif

endif

endif





my_enforced_uses_libraries :=

my_enforced_uses_libraries :=

ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES))

ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES))