diff options
| author | Logan Chien <loganchien@google.com> | 2018-01-05 01:52:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-05 01:52:40 +0000 |
| commit | 690899995ac49b69103eb1996030fd0c6a67c9f4 (patch) | |
| tree | 81a6b0d275f2f8e3b03dfa1aae33db4d4066de39 /tools | |
| parent | 8c8222e80bc6a0456b0c23a1665c557b025f7aee (diff) | |
| parent | 59605d4b36c6b6607e0b32be5ef6dab8a32c0c0b (diff) | |
| download | android_development-690899995ac49b69103eb1996030fd0c6a67c9f4.tar.gz android_development-690899995ac49b69103eb1996030fd0c6a67c9f4.tar.bz2 android_development-690899995ac49b69103eb1996030fd0c6a67c9f4.zip | |
Merge "idegen: Add compatibility for custom out directory" am: ba6d87d125 am: 92e433e88d
am: 59605d4b36
Change-Id: I434554e710311bd6a43089f8191648d5adc8c17b
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/idegen/idegen.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/idegen/idegen.sh b/tools/idegen/idegen.sh index d7e6986d8..a24fca58e 100755 --- a/tools/idegen/idegen.sh +++ b/tools/idegen/idegen.sh @@ -5,9 +5,14 @@ if [ ! -d development ]; then exit 1 fi +if [[ -z ${OUT_DIR_COMMON_BASE} ]]; then idegenjar=`find out -name idegen.jar -follow | grep -v intermediates` +else +idegenjar=`find $OUT_DIR_COMMON_BASE/$(basename "$PWD") -name idegen.jar -follow | grep -v intermediates` +fi + if [ "" = "$idegenjar" ]; then echo "Couldn't find idegen.jar. Please run make first." -else +else java -cp $idegenjar Main fi |