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

Commit 870d5f16 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev

parents 51e11eea a1fece00

core/base_rules.mk

+14 −0
Original line number Original line Diff line number Diff line
@@ -398,6 +398,20 @@ endif # !LOCAL_IS_HOST_MODULE 
full_java_libs += $(full_static_java_libs) $(LOCAL_CLASSPATH)

full_java_libs += $(full_static_java_libs) $(LOCAL_CLASSPATH)

full_java_lib_deps += $(full_static_java_libs) $(LOCAL_CLASSPATH)

full_java_lib_deps += $(full_static_java_libs) $(LOCAL_CLASSPATH)





# This is set by packages that are linking to other packages that export

# shared libraries, allowing them to make use of the code in the linked apk.

LOCAL_APK_LIBRARIES := $(strip $(LOCAL_APK_LIBRARIES))

ifdef LOCAL_APK_LIBRARIES

  link_apk_libraries := \

      $(foreach lib,$(LOCAL_APK_LIBRARIES), \

        $(call intermediates-dir-for, \

              APPS,$(lib),,COMMON)/classes.jar)



  # link against the jar with full original names (before proguard processing).

  full_java_libs += $(link_apk_libraries)

  full_java_lib_deps += $(link_apk_libraries)

endif



# This is set by packages that contain instrumentation, allowing them to

# This is set by packages that contain instrumentation, allowing them to

# link against the package they are instrumenting.  Currently only one such

# link against the package they are instrumenting.  Currently only one such

# package is allowed.

# package is allowed.

core/clear_vars.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ LOCAL_JNI_SHARED_LIBRARIES:= 
LOCAL_JNI_SHARED_LIBRARIES_ABI:=

LOCAL_JNI_SHARED_LIBRARIES_ABI:=

LOCAL_JAR_MANIFEST:=

LOCAL_JAR_MANIFEST:=

LOCAL_INSTRUMENTATION_FOR:=

LOCAL_INSTRUMENTATION_FOR:=

LOCAL_APK_LIBRARIES:=

LOCAL_MANIFEST_INSTRUMENTATION_FOR:=

LOCAL_MANIFEST_INSTRUMENTATION_FOR:=

LOCAL_AIDL_INCLUDES:=

LOCAL_AIDL_INCLUDES:=

LOCAL_JARJAR_RULES:=

LOCAL_JARJAR_RULES:=

core/java_library.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -35,11 +35,13 @@ ifneq (true,$(WITH_DEXPREOPT)) 
LOCAL_DEX_PREOPT :=

LOCAL_DEX_PREOPT :=

else

else

ifeq (,$(TARGET_BUILD_APPS))

ifeq (,$(TARGET_BUILD_APPS))

ifeq (,$(LOCAL_APK_LIBRARIES))

ifndef LOCAL_DEX_PREOPT

ifndef LOCAL_DEX_PREOPT

LOCAL_DEX_PREOPT := true

LOCAL_DEX_PREOPT := true

endif

endif

endif

endif

endif

endif

endif

ifeq (false,$(LOCAL_DEX_PREOPT))

ifeq (false,$(LOCAL_DEX_PREOPT))

LOCAL_DEX_PREOPT :=

LOCAL_DEX_PREOPT :=

endif

endif

core/package.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -151,6 +151,7 @@ ifneq (true,$(WITH_DEXPREOPT)) 
LOCAL_DEX_PREOPT :=

LOCAL_DEX_PREOPT :=

else

else

ifeq (,$(TARGET_BUILD_APPS))

ifeq (,$(TARGET_BUILD_APPS))

ifeq (,$(LOCAL_APK_LIBRARIES))

ifneq (,$(LOCAL_SRC_FILES))

ifneq (,$(LOCAL_SRC_FILES))

ifndef LOCAL_DEX_PREOPT

ifndef LOCAL_DEX_PREOPT

LOCAL_DEX_PREOPT := true

LOCAL_DEX_PREOPT := true
@@ -158,6 +159,7 @@ endif 
endif

endif

endif

endif

endif

endif

endif

ifeq (false,$(LOCAL_DEX_PREOPT))

ifeq (false,$(LOCAL_DEX_PREOPT))

LOCAL_DEX_PREOPT :=

LOCAL_DEX_PREOPT :=

endif

endif