diff options
| author | Siva Velusamy <vsiva@google.com> | 2012-05-29 12:15:41 -0700 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2012-05-30 10:17:57 -0700 |
| commit | 50f6b123bd688e6e0e7cdf1e8ad342ffffa4d0bf (patch) | |
| tree | 3c8ebae6690817d08427f2e4654ffa327adb95ab | |
| parent | 266f4b90e0aaafb7cbba969c093a8f58c2653fa8 (diff) | |
| download | sdk-50f6b123bd688e6e0e7cdf1e8ad342ffffa4d0bf.zip sdk-50f6b123bd688e6e0e7cdf1e8ad342ffffa4d0bf.tar.gz sdk-50f6b123bd688e6e0e7cdf1e8ad342ffffa4d0bf.tar.bz2 | |
monitor: Build only if dependencies have changed.
This CL fixes two issues:
- Fully expanding the path to the libraries (i.e commong -> out/host/../common.jar)
allows the use of "mm" from sdk/monitor/ folder.
- The target of the build (the monitor script) will now have a timestamp that
corresponds to when it was last built, as opposed to when the source script was
last modified. As a result, timestamps of the dependency jar files are correctly
checked with the last build time of the target.
Change-Id: I77469561d6750d1942cfeda1d6672d6d2a5dad51
| -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 |