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

Commit f03c455e authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Xin Li
Browse files

Revert^2 "Enforce <uses-library> check for Android.mk modules." 

This reverts commit a700ad46.

Reason for revert: relanding original CL with correct Merged-In tag.

Use "Merged-In" tag from CL ag/14062434 to prevent merging in the
stage-aosp-master branch. That CL is unrelated to the current CL,
but related to <uses-library> checks in general.

Bug: 132357300
Test: treehugger
Merged-In: I6395a23e1e0ad3a6a7f7e577c8c00805ed198441
Change-Id: I261c5150c4cd469ca96a5cc98b050de170dc2f9c
parent 188fcac0

core/dex_preopt_odex_install.mk

+2 −7
Original line number Diff line number Diff line
@@ -230,15 +230,10 @@ 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

# 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.

# Verify LOCAL_USES_LIBRARIES/LOCAL_OPTIONAL_USES_LIBRARIES against the manifest.

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))