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

Commit 0cc8d198 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "When building unbundled apps, link to the prebuilt stubs lib" am: 7207e41d am: 86091aab

am: 025994b3

Change-Id: Ib33b5fa7a3857befaa059e0184ef94d63288a259
parents d83e6d9d 025994b3
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -259,9 +259,14 @@ ifndef LOCAL_IS_HOST_MODULE
      LOCAL_JAVA_LIBRARIES := $(filter-out $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES),$(LOCAL_JAVA_LIBRARIES))
      my_system_modules := $(DEFAULT_SYSTEM_MODULES)
    endif  # LOCAL_NO_STANDARD_LIBRARIES

    ifneq (,$(TARGET_BUILD_APPS))
      sdk_libs := $(foreach lib_name,$(LOCAL_SDK_LIBRARIES),$(call resolve-prebuilt-sdk-module,system_current,$(lib_name)))
    else
      # When SDK libraries are referenced from modules built without SDK, provide the system stub to them
      # because it has the largest API surface.
      sdk_libs := $(foreach lib_name,$(LOCAL_SDK_LIBRARIES),$(lib_name).stubs.system)
    endif
  else
    ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
      $(call pretty-error,Must not define both LOCAL_NO_STANDARD_LIBRARIES and LOCAL_SDK_VERSION)