diff options
| author | Elliott Hughes <enh@google.com> | 2012-08-28 17:56:09 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-08-28 17:56:09 -0700 |
| commit | 73d3e262ecf514ef17f47da335fdad899aecc3dc (patch) | |
| tree | ae19ecfc6d5f54a8716dadc4bd187ff0066e38f8 | |
| parent | d285287034b34bbb67b6cfdc8065468cbcbac585 (diff) | |
| download | libcore-73d3e262ecf514ef17f47da335fdad899aecc3dc.zip libcore-73d3e262ecf514ef17f47da335fdad899aecc3dc.tar.gz libcore-73d3e262ecf514ef17f47da335fdad899aecc3dc.tar.bz2 | |
Add dependencies on the makefiles.
I've been enjoying this in bionic for a while now, and was annoyed
not to have make do the right thing in libcore.
Change-Id: Idcd2db48349202259887499a1f47d85c5d205d54
| -rw-r--r-- | CaCerts.mk | 1 | ||||
| -rw-r--r-- | JavaLibrary.mk | 5 | ||||
| -rw-r--r-- | NativeCode.mk | 3 |
3 files changed, 9 insertions, 0 deletions
@@ -30,6 +30,7 @@ endef define include-prebuilt-with-destination-directory include $$(CLEAR_VARS) LOCAL_MODULE := $(1) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/CaCerts.mk LOCAL_MODULE_STEM := $(notdir $(2)) LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 4d91adb..59ac2e1 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -82,6 +82,7 @@ LOCAL_NO_EMMA_INSTRUMENT := true LOCAL_NO_EMMA_COMPILE := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk include $(BUILD_JAVA_LIBRARY) @@ -98,6 +99,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc mockwebserver LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_NO_EMMA_INSTRUMENT := true LOCAL_NO_EMMA_COMPILE := true include $(BUILD_STATIC_JAVA_LIBRARY) @@ -140,6 +142,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-hostdex + LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk include $(BUILD_HOST_JAVA_LIBRARY) @@ -153,6 +156,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-tests-hostdex + LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_NO_EMMA_INSTRUMENT := true LOCAL_NO_EMMA_COMPILE := true LOCAL_BUILD_HOST_DEX := true @@ -190,6 +194,7 @@ LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_CLASS:=JAVA_LIBRARIES LOCAL_MODULE := libcore +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_DROIDDOC_OPTIONS:= \ -offlinemode \ diff --git a/NativeCode.mk b/NativeCode.mk index fae0fce..1aab901 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -53,6 +53,7 @@ endef # set up. include $(CLEAR_VARS) LOCAL_MODULE := $(core_magic_local_target) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk core_src_files := # Include the sub.mk files. @@ -88,6 +89,7 @@ LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libexpat libicuuc libicui18n LOCAL_STATIC_LIBRARIES := $(core_static_libraries) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include LOCAL_SHARED_LIBRARIES += libstlport @@ -108,6 +110,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_LDLIBS += -ldl -lpthread LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore + LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libexpat libicuuc libicui18n libssl libcrypto libz-host LOCAL_STATIC_LIBRARIES := $(core_static_libraries) include $(BUILD_HOST_SHARED_LIBRARY) |