tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Dianne Hackborn 2013-03-12 19:31:11 +00:00 committed by Android (Google) Code Review
commit 870d5f16a5
4 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/base_rules.mk
View file

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

1
core/clear_vars.mk
View file

@ -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:=

2
core/java_library.mk
View file

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

2
core/package.mk
View file

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