diff options
| author | Colin Cross <ccross@android.com> | 2017-06-20 17:41:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-20 17:41:43 +0000 |
| commit | 3c325846f2ffb7b630c6d7fe3d1e29cde1c12fb4 (patch) | |
| tree | 5cbad3cd043369580a565182eb9c4c0fe2ced64e | |
| parent | ccd15c420a677b7b8a2f938e48959d9bc463c8f8 (diff) | |
| parent | 2637ef07b5321a30a6bc900bfb5b527c204f2d15 (diff) | |
| download | jdk8u-3c325846f2ffb7b630c6d7fe3d1e29cde1c12fb4.tar.gz | |
Make OpenJDK build work with repo .git directories
am: 2637ef07b5
Change-Id: I074bed9e5716682ee3707489ae2ac7c1d1f87aab
| -rw-r--r-- | make/HotspotWrapper.gmk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/HotspotWrapper.gmk b/make/HotspotWrapper.gmk index 51437df..99a2b23 100644 --- a/make/HotspotWrapper.gmk +++ b/make/HotspotWrapper.gmk @@ -35,8 +35,8 @@ include MakeBase.gmk default: all -# Get all files except .hg in the hotspot directory. -HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print) +# Get all files except .hg or .git in the hotspot directory. +HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -o -name ".git" -prune -o -print) # The old build creates hotspot output dir before calling hotspot and # not doing it breaks builds on msys. |