diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-05-16 18:58:45 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-05-16 18:59:28 +0300 |
| commit | 40fab3bd05880e1ee35022037f1f7ea4f5ff999a (patch) | |
| tree | 02573e4ce911b22b19924ef4c2bb12c85a222623 /android/qa/desktop/Makefile | |
| parent | fcbfccdeb0d1f25627f9be8d4ca1b886e0b184a5 (diff) | |
Don't create the local.properties files in the source tree from configure
Change-Id: Ic87be0146360c5e32f1f12f255c897e051c9a50c
Diffstat (limited to 'android/qa/desktop/Makefile')
| -rw-r--r-- | android/qa/desktop/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index 490a7a8b55db..7a15bf581a52 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -26,6 +26,10 @@ endef all: build-ant +properties: + echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties + echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties + buildrcs: # main sofficerc ini ... mkdir -p assets/program/ @@ -229,10 +233,10 @@ copy-stuff: buildrcs echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup -build-ant: copy-stuff +build-ant: copy-stuff properties unset JAVA_HOME && $(ANT) debug -install: copy-stuff +install: copy-stuff properties $(ANDROID_SDK_HOME)/platform-tools/adb shell rm -r $(APP_DATA_PATH) unset JAVA_HOME && $(ANT) debug install @echo @@ -254,7 +258,7 @@ run: stop-start-cycle: $(ANDROID_SDK_HOME)/platform-tools/adb shell stop && $(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10 -clean: +clean: properties $(ANT) clean rm -rf assets $(SODEST) $(OBJLOCAL) |