diff options
| author | Siva Velusamy <vsiva@google.com> | 2012-05-30 10:18:42 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-30 10:18:42 -0700 |
| commit | a65182c586d3e33e77ca424b684ca2f40729c77c (patch) | |
| tree | d4ab4e4f2a70de66fe784c762abb1d039e7a0089 | |
| parent | 8a7ac644b4d1197849fb1ae5d81730c807ba89eb (diff) | |
| parent | 50f6b123bd688e6e0e7cdf1e8ad342ffffa4d0bf (diff) | |
| download | sdk-a65182c586d3e33e77ca424b684ca2f40729c77c.zip sdk-a65182c586d3e33e77ca424b684ca2f40729c77c.tar.gz sdk-a65182c586d3e33e77ca424b684ca2f40729c77c.tar.bz2 | |
Merge "monitor: Build only if dependencies have changed."
| -rw-r--r-- | monitor/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/monitor/Android.mk b/monitor/Android.mk index 2661dc6..9973d64 100644 --- a/monitor/Android.mk +++ b/monitor/Android.mk @@ -23,11 +23,14 @@ define mk-rcp-monitor-atree-file unzip -q $$srczip -d $$dstdir endef +MONITOR_DEP_LIBRARIES := $(shell $(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -d) +MONITOR_DEPS := $(foreach m,$(MONITOR_DEP_LIBRARIES),$(HOST_OUT_JAVA_LIBRARIES)/$(m).jar) + # The RCP monitor. It is referenced by build/target/products/sdk.mk $(LOCAL_BUILT_MODULE) : $(TOPDIR)sdk/monitor/monitor \ $(TOPDIR)sdk/monitor/build.xml \ $(TOPDIR)sdk/monitor/build.properties \ - $(shell $(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -d) + $(MONITOR_DEPS) @mkdir -p $(dir $@) $(hide)$(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -c $(hide)cd $(TOPDIR)sdk/monitor && \ @@ -54,6 +57,6 @@ $(LOCAL_BUILT_MODULE) : $(TOPDIR)sdk/monitor/monitor \ $(call mk-rcp-monitor-atree-file,win32.win32,x86) ; \ $(call mk-rcp-monitor-atree-file,win32.win32,x86_64) ; \ fi - $(hide)$(ACP) -fpt $(V) $(TOPDIR)sdk/monitor/monitor $@ + $(hide)$(ACP) -fp $(V) $(TOPDIR)sdk/monitor/monitor $@ endif |