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

Commit 4638df92 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I0ada141bc5e46ac69be60d6c93f7e769d96277e7
parents cfcd1d98 6eac4c22

core/dex_preopt_odex_install.mk

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

endif



# Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES against the manifest.

# Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES

# 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

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

    LOCAL_ENFORCE_USES_LIBRARIES := true

  endif

endif



my_enforced_uses_libraries :=

ifeq (true,$(LOCAL_ENFORCE_USES_LIBRARIES))