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

Commit ea6063f1 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Add deps on LOCAL_SHARED_LIBRARIES for prebuilts."

parents bb094c59 90397c10
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -33,14 +33,15 @@ ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS))
  OVERRIDE_BUILT_MODULE_PATH := $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)
endif

# Deal with the OSX library timestamp issue when installing
# a prebuilt simulator library.
ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),)
  prebuilt_module_is_a_library := true
else
  prebuilt_module_is_a_library :=
endif

# Install the shared libraries if necessary
LOCAL_REQUIRED_MODULES += $(LOCAL_SHARED_LIBRARIES)

# Don't install static libraries by default.
ifndef LOCAL_UNINSTALLABLE_MODULE
ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS))